From 57e827b2f4fa38861e6b57b00c232a1d56018f74 Mon Sep 17 00:00:00 2001 From: Oron Peled Date: Wed, 25 Jan 2012 21:17:10 +0000 Subject: [PATCH] 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 --- drivers/dahdi/dahdi-sysfs.c | 6 ------ include/dahdi/kernel.h | 6 ++++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/dahdi/dahdi-sysfs.c b/drivers/dahdi/dahdi-sysfs.c index 489befd..8209607 100644 --- a/drivers/dahdi/dahdi-sysfs.c +++ b/drivers/dahdi/dahdi-sysfs.c @@ -157,12 +157,6 @@ static int span_hotplug(struct device *dev, char **envp, int envnum, return err; \ } while (0) -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26) -#define dev_name(dev) ((dev)->bus_id) -#define dev_set_name(dev, format, ...) \ - snprintf((dev)->bus_id, BUS_ID_SIZE, format, ## __VA_ARGS__); -#endif - static int span_uevent(struct device *dev, char **envp, int num_envp, char *buffer, int buffer_size) { 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