[svn-commits] tzafrir: linux/trunk r10447 - in /linux/trunk: drivers/dahdi/ include/dahdi/

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Wed Jan 25 15:17:10 2012
New Revision: 10447

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=10447
Log:
remove a duplicate dev_set_name()

Remove duplicate definition from dahdi-sysfs.c

Signed-off-by: Oron Peled <oron.peled at xorcom.com>
Acked-by: Tzafrir Cohen <tzafrir.cohen at xorcom.com>

Modified:
    linux/trunk/drivers/dahdi/dahdi-sysfs.c
    linux/trunk/include/dahdi/kernel.h

Modified: linux/trunk/drivers/dahdi/dahdi-sysfs.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/dahdi-sysfs.c?view=diff&rev=10447&r1=10446&r2=10447
==============================================================================
--- linux/trunk/drivers/dahdi/dahdi-sysfs.c (original)
+++ linux/trunk/drivers/dahdi/dahdi-sysfs.c Wed Jan 25 15:17:10 2012
@@ -157,12 +157,6 @@
 			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)
 {

Modified: linux/trunk/include/dahdi/kernel.h
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/include/dahdi/kernel.h?view=diff&rev=10447&r1=10446&r2=10447
==============================================================================
--- linux/trunk/include/dahdi/kernel.h (original)
+++ linux/trunk/include/dahdi/kernel.h Wed Jan 25 15:17:10 2012
@@ -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