[PATCH] 2.5.21 kill warnings 4/19

Martin Dalecki
2002-06-10T12:25:43Z

[-- Attachment #1: Type: text/plain, Size: 170 bytes --]

Fix improper usage of __FUNCTION__ in usb code.
Fix unpleasant results from some code formatting
editor (propably emacs) in i2c, which broke
an error message altogether.

[-- Attachment #2: warn-2.5.21-4.diff --]
[-- Type: text/plain, Size: 2340 bytes --]

diff -urN linux-2.5.21/drivers/hotplug/pci_hotplug_core.c linux/drivers/hotplug/pci_hotplug_core.c
--- linux-2.5.21/drivers/hotplug/pci_hotplug_core.c 2002-06-09 07:28:23.000000000 +0200
+++ linux/drivers/hotplug/pci_hotplug_core.c 2002-06-09 20:48:07.000000000 +0200
@@ -48,7 +48,7 @@
#define MY_NAME THIS_MODULE->name
#endif

-#define dbg(fmt, arg...) do { if (debug) printk(KERN_DEBUG "%s: "__FUNCTION__": " fmt , MY_NAME , ## arg); } while (0)
+#define dbg(fmt, arg...) do { if (debug) printk(KERN_DEBUG "%s: %s: " fmt, MY_NAME, __FUNCTION__, ## arg); } while (0)
#define err(format, arg...) printk(KERN_ERR "%s: " format , MY_NAME , ## arg)
#define info(format, arg...) printk(KERN_INFO "%s: " format , MY_NAME , ## arg)
#define warn(format, arg...) printk(KERN_WARNING "%s: " format , MY_NAME , ## arg)
diff -urN linux-2.5.21/drivers/hotplug/pci_hotplug_util.c linux/drivers/hotplug/pci_hotplug_util.c
--- linux-2.5.21/drivers/hotplug/pci_hotplug_util.c 2002-06-09 07:30:52.000000000 +0200
+++ linux/drivers/hotplug/pci_hotplug_util.c 2002-06-09 19:20:08.000000000 +0200
@@ -41,7 +41,7 @@
#define MY_NAME THIS_MODULE->name
#endif

-#define dbg(fmt, arg...) do { if (debug) printk(KERN_DEBUG "%s: "__FUNCTION__": " fmt , MY_NAME , ## arg); } while (0)
+#define dbg(fmt, arg...) do { if (debug) printk(KERN_DEBUG "%s: %s: " fmt, MY_NAME, __FUNCTION__, ## arg); } while (0)
#define err(format, arg...) printk(KERN_ERR "%s: " format , MY_NAME , ## arg)
#define info(format, arg...) printk(KERN_INFO "%s: " format , MY_NAME , ## arg)
#define warn(format, arg...) printk(KERN_WARNING "%s: " format , MY_NAME , ## arg)
diff -urN linux-2.5.21/drivers/i2c/i2c-core.c linux/drivers/i2c/i2c-core.c
--- linux-2.5.21/drivers/i2c/i2c-core.c 2002-06-09 07:27:35.000000000 +0200
+++ linux/drivers/i2c/i2c-core.c 2002-06-09 19:21:30.000000000 +0200
@@ -381,10 +381,10 @@
printk("i2c-core.o: while "
"unregistering driver "
"`%s', the client at "
- "address %02x of
- adapter `%s' could not
- be detached; driver
- not unloaded!",
+ "address %02x of "
+ "adapter `%s' could not "
+ "be detached; driver "
+ "not unloaded!",
driver->name,
client->addr,
adap->name);