From f14814863c28db34b341e68cc97c8c70d539d021 Mon Sep 17 00:00:00 2001 From: Tzafrir Cohen Date: Wed, 25 Jan 2012 21:17:10 +0000 Subject: remove a duplicate dev_set_name() Remove duplicate definition from dahdi-sysfs.c Signed-off-by: Oron Peled Acked-by: Tzafrir Cohen git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@10447 a0bf4364-ded3-4de4-8d8a-66a801d63aff --- include/dahdi/kernel.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h index 818df60..f141562 100644 --- a/include/dahdi/kernel.h +++ b/include/dahdi/kernel.h @@ -101,8 +101,10 @@ # else #define dev_name(dev) ((dev)->bus_id) # endif -#define dev_set_name(dev, format, ...) \ - snprintf((dev)->bus_id, BUS_ID_SIZE, format, ## __VA_ARGS__); +#define dev_set_name(dev, fmt, ...) \ + do { \ + snprintf((dev)->bus_id, BUS_ID_SIZE, fmt, ## __VA_ARGS__); \ + } while (0) #endif /*! Default chunk size for conferences and such -- static right now, might make -- cgit v1.2.3