On Thu, Jun 07, 2001 at 12:18:06PM -0700, Mark McClelland wrote:
> Hmm, why not description + version? It seems a bit easier to read,
> which translates to less-confusing-to-users, which is good for everyone.
I agree. Xavier sent me the following patch that does just that. Look
good for everyone?
thanks,
greg k-h
diff -u --recursive linux-2.4.6-1/drivers/usb/acm.c linux-2.4.6-1-usb/drivers/usb/acm.c
--- linux-2.4.6-1/drivers/usb/acm.c Wed Jun 6 21:57:48 2001
+++ linux-2.4.6-1-usb/drivers/usb/acm.c Wed Jun 6 22:52:36 2001
@@ -709,8 +709,7 @@
return -1;
}
- info(DRIVER_VERSION " " DRIVER_AUTHOR);
- info(DRIVER_DESC);
+ info(DRIVER_VERSION ":" DRIVER_DESC);
return 0;
}
diff -u --recursive linux-2.4.6-1/drivers/usb/audio.c
linux-2.4.6-1-usb/drivers/usb/audio.c
--- linux-2.4.6-1/drivers/usb/audio.c Wed Jun 6 21:57:48 2001
+++ linux-2.4.6-1-usb/drivers/usb/audio.c Wed Jun 6 22:52:42 2001
@@ -3755,8 +3755,7 @@
static int __init usb_audio_init(void)
{
usb_register(&usb_audio_driver);
- info(DRIVER_VERSION " " DRIVER_AUTHOR);
- info(DRIVER_DESC);
+ info(DRIVER_VERSION ":" DRIVER_DESC);
return 0;
}
diff -u --recursive linux-2.4.6-1/drivers/usb/bluetooth.c
linux-2.4.6-1-usb/drivers/usb/bluetooth.c
--- linux-2.4.6-1/drivers/usb/bluetooth.c Wed Jun 6 21:58:15 2001
+++ linux-2.4.6-1-usb/drivers/usb/bluetooth.c Wed Jun 6 22:52:50 2001
@@ -1314,8 +1314,7 @@
return -1;
}
- info(DRIVER_VERSION " " DRIVER_AUTHOR);
- info(DRIVER_DESC);
+ info(DRIVER_VERSION ":" DRIVER_DESC);
return 0;
}
diff -u --recursive linux-2.4.6-1/drivers/usb/dabusb.c
linux-2.4.6-1-usb/drivers/usb/dabusb.c
--- linux-2.4.6-1/drivers/usb/dabusb.c Wed Jun 6 21:57:48 2001
+++ linux-2.4.6-1-usb/drivers/usb/dabusb.c Wed Jun 6 22:52:57 2001
@@ -837,8 +837,7 @@
dbg("dabusb_init: driver registered");
- info(DRIVER_VERSION " " DRIVER_AUTHOR);
- info(DRIVER_DESC);
+ info(DRIVER_VERSION ":" DRIVER_DESC);
return 0;
}
diff -u --recursive linux-2.4.6-1/drivers/usb/dc2xx.c
linux-2.4.6-1-usb/drivers/usb/dc2xx.c
--- linux-2.4.6-1/drivers/usb/dc2xx.c Wed Jun 6 21:57:48 2001
+++ linux-2.4.6-1-usb/drivers/usb/dc2xx.c Wed Jun 6 22:53:02 2001
@@ -499,8 +499,7 @@
{
if (usb_register (&camera_driver) < 0)
return -1;
- info(DRIVER_VERSION " " DRIVER_AUTHOR);
- info(DRIVER_DESC);
+ info(DRIVER_VERSION ":" DRIVER_DESC);
return 0;
}
diff -u --recursive linux-2.4.6-1/drivers/usb/dsbr100.c
linux-2.4.6-1-usb/drivers/usb/dsbr100.c
--- linux-2.4.6-1/drivers/usb/dsbr100.c Wed Jun 6 21:57:48 2001
+++ linux-2.4.6-1-usb/drivers/usb/dsbr100.c Wed Jun 6 22:53:08 2001
@@ -342,8 +342,7 @@
warn("couldn't register video device");
return -EINVAL;
}
- info(DRIVER_VERSION " " DRIVER_AUTHOR);
- info(DRIVER_DESC);
+ info(DRIVER_VERSION ":" DRIVER_DESC);
return 0;
}
diff -u --recursive linux-2.4.6-1/drivers/usb/hid.c linux-2.4.6-1-usb/drivers/usb/hid.c
--- linux-2.4.6-1/drivers/usb/hid.c Wed Jun 6 21:57:48 2001
+++ linux-2.4.6-1-usb/drivers/usb/hid.c Wed Jun 6 22:53:12 2001
@@ -1559,8 +1559,7 @@
static int __init hid_init(void)
{
usb_register(&hid_driver);
- info(DRIVER_VERSION " " DRIVER_AUTHOR);
- info(DRIVER_DESC);
+ info(DRIVER_VERSION ":" DRIVER_DESC);
return 0;
}
diff -u --recursive linux-2.4.6-1/drivers/usb/ibmcam.c
linux-2.4.6-1-usb/drivers/usb/ibmcam.c
--- linux-2.4.6-1/drivers/usb/ibmcam.c Wed Jun 6 21:57:48 2001
+++ linux-2.4.6-1-usb/drivers/usb/ibmcam.c Wed Jun 6 22:53:17 2001
@@ -3147,8 +3147,7 @@
struct usb_ibmcam *ibmcam = &cams[u];
memset (ibmcam, 0, sizeof(struct usb_ibmcam));
}
- info(DRIVER_VERSION " " DRIVER_AUTHOR);
- info(DRIVER_DESC);
+ info(DRIVER_VERSION ":" DRIVER_DESC);
return usb_register(&ibmcam_driver);
}
diff -u --recursive linux-2.4.6-1/drivers/usb/mdc800.c
linux-2.4.6-1-usb/drivers/usb/mdc800.c
--- linux-2.4.6-1/drivers/usb/mdc800.c Wed Jun 6 21:57:48 2001
+++ linux-2.4.6-1-usb/drivers/usb/mdc800.c Wed Jun 6 22:53:24 2001
@@ -932,8 +932,7 @@
if (usb_register (&mdc800_usb_driver) < 0)
goto cleanup_on_fail;
- info (DRIVER_VERSION " " DRIVER_AUTHOR);
- info (DRIVER_DESC);
+ info (DRIVER_VERSION ":" DRIVER_DESC);
return 0;
diff -u --recursive linux-2.4.6-1/drivers/usb/microtek.c
linux-2.4.6-1-usb/drivers/usb/microtek.c
--- linux-2.4.6-1/drivers/usb/microtek.c Wed Jun 6 21:57:48 2001
+++ linux-2.4.6-1-usb/drivers/usb/microtek.c Wed Jun 6 22:53:28 2001
@@ -1029,8 +1029,7 @@
MTS_DEBUG("driver registered.\n");
}
- info(DRIVER_VERSION " " DRIVER_AUTHOR);
- info(DRIVER_DESC);
+ info(DRIVER_VERSION ":" DRIVER_DESC);
return 0;
}
diff -u --recursive linux-2.4.6-1/drivers/usb/net1080.c
linux-2.4.6-1-usb/drivers/usb/net1080.c
--- linux-2.4.6-1/drivers/usb/net1080.c Wed Jun 6 21:57:48 2001
+++ linux-2.4.6-1-usb/drivers/usb/net1080.c Wed Jun 6 22:53:32 2001
@@ -1111,8 +1111,7 @@
get_random_bytes (node_id, sizeof node_id);
node_id [0] &= 0x7f;
- info(DRIVER_VERSION " " DRIVER_AUTHOR);
- info(DRIVER_DESC);
+ info(DRIVER_VERSION ":" DRIVER_DESC);
return 0;
}
diff -u --recursive linux-2.4.6-1/drivers/usb/ov511.c
linux-2.4.6-1-usb/drivers/usb/ov511.c
--- linux-2.4.6-1/drivers/usb/ov511.c Wed Jun 6 21:58:15 2001
+++ linux-2.4.6-1-usb/drivers/usb/ov511.c Wed Jun 6 22:53:40 2001
@@ -3426,8 +3426,7 @@
if (usb_register(&ov511_driver) < 0)
return -1;
- info(DRIVER_VERSION " " DRIVER_AUTHOR);
- info(DRIVER_DESC);
+ info(DRIVER_VERSION ":" DRIVER_DESC);
return 0;
}
diff -u --recursive linux-2.4.6-1/drivers/usb/pegasus.c
linux-2.4.6-1-usb/drivers/usb/pegasus.c
--- linux-2.4.6-1/drivers/usb/pegasus.c Wed Jun 6 21:58:15 2001
+++ linux-2.4.6-1-usb/drivers/usb/pegasus.c Wed Jun 6 22:53:45 2001
@@ -935,8 +935,7 @@
int __init pegasus_init(void)
{
- info(DRIVER_VERSION " " DRIVER_AUTHOR);
- info(DRIVER_DESC);
+ info(DRIVER_VERSION ":" DRIVER_DESC);
return usb_register( &pegasus_driver );
}
diff -u --recursive linux-2.4.6-1/drivers/usb/plusb.c
linux-2.4.6-1-usb/drivers/usb/plusb.c
--- linux-2.4.6-1/drivers/usb/plusb.c Wed Jun 6 21:57:48 2001
+++ linux-2.4.6-1-usb/drivers/usb/plusb.c Wed Jun 6 22:53:51 2001
@@ -1014,8 +1014,7 @@
dbg("plusb_init: driver registered");
- info(DRIVER_VERSION " " DRIVER_AUTHOR);
- info(DRIVER_DESC);
+ info(DRIVER_VERSION ":" DRIVER_DESC);
return 0;
}
diff -u --recursive linux-2.4.6-1/drivers/usb/printer.c
linux-2.4.6-1-usb/drivers/usb/printer.c
--- linux-2.4.6-1/drivers/usb/printer.c Wed Jun 6 21:57:48 2001
+++ linux-2.4.6-1-usb/drivers/usb/printer.c Wed Jun 6 22:53:55 2001
@@ -662,8 +662,7 @@
{
if (usb_register(&usblp_driver))
return -1;
- info(DRIVER_VERSION " " DRIVER_AUTHOR);
- info(DRIVER_DESC);
+ info(DRIVER_VERSION ":" DRIVER_DESC);
return 0;
}
diff -u --recursive linux-2.4.6-1/drivers/usb/rio500.c
linux-2.4.6-1-usb/drivers/usb/rio500.c
--- linux-2.4.6-1/drivers/usb/rio500.c Wed Jun 6 21:57:48 2001
+++ linux-2.4.6-1-usb/drivers/usb/rio500.c Wed Jun 6 22:54:02 2001
@@ -492,8 +492,7 @@
if (usb_register(&rio_driver) < 0)
return -1;
- info(DRIVER_VERSION " " DRIVER_AUTHOR);
- info(DRIVER_DESC);
+ info(DRIVER_VERSION ":" DRIVER_DESC);
return 0;
}
diff -u --recursive linux-2.4.6-1/drivers/usb/serial/belkin_sa.c
linux-2.4.6-1-usb/drivers/usb/serial/belkin_sa.c
--- linux-2.4.6-1/drivers/usb/serial/belkin_sa.c Wed Jun 6 21:57:48 2001
+++ linux-2.4.6-1-usb/drivers/usb/serial/belkin_sa.c Wed Jun 6 22:55:06 2001
@@ -600,8 +600,7 @@
usb_serial_register (&belkin_old_device);
usb_serial_register (&peracom_device);
usb_serial_register (&gocom232_device);
- info(DRIVER_VERSION " " DRIVER_AUTHOR);
- info(DRIVER_DESC);
+ info(DRIVER_VERSION ":" DRIVER_DESC);
return 0;
}
diff -u --recursive linux-2.4.6-1/drivers/usb/serial/digi_acceleport.c
linux-2.4.6-1-usb/drivers/usb/serial/digi_acceleport.c
--- linux-2.4.6-1/drivers/usb/serial/digi_acceleport.c Wed Jun 6 21:57:48 2001
+++ linux-2.4.6-1-usb/drivers/usb/serial/digi_acceleport.c Wed Jun 6 22:55:10
+2001
@@ -2078,8 +2078,7 @@
{
usb_serial_register (&digi_acceleport_2_device);
usb_serial_register (&digi_acceleport_4_device);
- info(DRIVER_VERSION " " DRIVER_AUTHOR);
- info(DRIVER_DESC);
+ info(DRIVER_VERSION ":" DRIVER_DESC);
return 0;
}
diff -u --recursive linux-2.4.6-1/drivers/usb/serial/empeg.c
linux-2.4.6-1-usb/drivers/usb/serial/empeg.c
--- linux-2.4.6-1/drivers/usb/serial/empeg.c Wed Jun 6 21:57:48 2001
+++ linux-2.4.6-1-usb/drivers/usb/serial/empeg.c Wed Jun 6 22:55:15 2001
@@ -680,8 +680,7 @@
}
}
- info(DRIVER_VERSION " " DRIVER_AUTHOR);
- info(DRIVER_DESC);
+ info(DRIVER_VERSION ":" DRIVER_DESC);
return 0;
diff -u --recursive linux-2.4.6-1/drivers/usb/serial/ftdi_sio.c
linux-2.4.6-1-usb/drivers/usb/serial/ftdi_sio.c
--- linux-2.4.6-1/drivers/usb/serial/ftdi_sio.c Wed Jun 6 21:57:48 2001
+++ linux-2.4.6-1-usb/drivers/usb/serial/ftdi_sio.c Wed Jun 6 22:55:19 2001
@@ -985,8 +985,7 @@
dbg(__FUNCTION__);
usb_serial_register (&ftdi_sio_device);
usb_serial_register (&ftdi_8U232AM_device);
- info(DRIVER_VERSION " " DRIVER_AUTHOR);
- info(DRIVER_DESC);
+ info(DRIVER_VERSION ":" DRIVER_DESC);
return 0;
}
diff -u --recursive linux-2.4.6-1/drivers/usb/serial/io_edgeport.c
linux-2.4.6-1-usb/drivers/usb/serial/io_edgeport.c
--- linux-2.4.6-1/drivers/usb/serial/io_edgeport.c Wed Jun 6 21:58:15 2001
+++ linux-2.4.6-1-usb/drivers/usb/serial/io_edgeport.c Wed Jun 6 22:55:24 2001
@@ -3037,8 +3037,7 @@
usb_serial_register (&edgeport_16dual_device);
usb_serial_register (&edgeport_compat_id_device);
usb_serial_register (&edgeport_8i_device);
- info(DRIVER_VERSION " " DRIVER_AUTHOR);
- info(DRIVER_DESC);
+ info(DRIVER_VERSION ":" DRIVER_DESC);
return 0;
}
diff -u --recursive linux-2.4.6-1/drivers/usb/serial/keyspan.c
linux-2.4.6-1-usb/drivers/usb/serial/keyspan.c
--- linux-2.4.6-1/drivers/usb/serial/keyspan.c Wed Jun 6 21:57:48 2001
+++ linux-2.4.6-1-usb/drivers/usb/serial/keyspan.c Wed Jun 6 22:55:28 2001
@@ -177,8 +177,7 @@
usb_serial_register (&keyspan_usa28x_device);
usb_serial_register (&keyspan_usa49w_device);
- info(DRIVER_VERSION " " DRIVER_AUTHOR);
- info(DRIVER_DESC);
+ info(DRIVER_VERSION ":" DRIVER_DESC);
return 0;
}
diff -u --recursive linux-2.4.6-1/drivers/usb/serial/keyspan_pda.c
linux-2.4.6-1-usb/drivers/usb/serial/keyspan_pda.c
--- linux-2.4.6-1/drivers/usb/serial/keyspan_pda.c Wed Jun 6 21:57:48 2001
+++ linux-2.4.6-1-usb/drivers/usb/serial/keyspan_pda.c Wed Jun 6 22:55:32 2001
@@ -817,8 +817,7 @@
{
usb_serial_register (&keyspan_pda_fake_device);
usb_serial_register (&keyspan_pda_device);
- info(DRIVER_VERSION " " DRIVER_AUTHOR);
- info(DRIVER_DESC);
+ info(DRIVER_VERSION ":" DRIVER_DESC);
return 0;
}
diff -u --recursive linux-2.4.6-1/drivers/usb/serial/mct_u232.c
linux-2.4.6-1-usb/drivers/usb/serial/mct_u232.c
--- linux-2.4.6-1/drivers/usb/serial/mct_u232.c Wed Jun 6 21:57:48 2001
+++ linux-2.4.6-1-usb/drivers/usb/serial/mct_u232.c Wed Jun 6 22:55:35 2001
@@ -870,8 +870,7 @@
usb_serial_register (&mct_u232_device);
usb_serial_register (&mct_u232_sitecom_device);
usb_serial_register (&mct_u232_du_h3sp_device);
- info(DRIVER_VERSION " " DRIVER_AUTHOR);
- info(DRIVER_DESC);
+ info(DRIVER_VERSION ":" DRIVER_DESC);
return 0;
}
diff -u --recursive linux-2.4.6-1/drivers/usb/serial/omninet.c
linux-2.4.6-1-usb/drivers/usb/serial/omninet.c
--- linux-2.4.6-1/drivers/usb/serial/omninet.c Wed Jun 6 21:57:48 2001
+++ linux-2.4.6-1-usb/drivers/usb/serial/omninet.c Wed Jun 6 22:55:42 2001
@@ -406,8 +406,7 @@
static int __init omninet_init (void)
{
usb_serial_register (&zyxel_omninet_device);
- info(DRIVER_VERSION " " DRIVER_AUTHOR);
- info(DRIVER_DESC);
+ info(DRIVER_VERSION ":" DRIVER_DESC);
return 0;
}
diff -u --recursive linux-2.4.6-1/drivers/usb/serial/usbserial.c
linux-2.4.6-1-usb/drivers/usb/serial/usbserial.c
--- linux-2.4.6-1/drivers/usb/serial/usbserial.c Wed Jun 6 21:57:48 2001
+++ linux-2.4.6-1-usb/drivers/usb/serial/usbserial.c Wed Jun 6 22:55:46 2001
@@ -1395,8 +1395,7 @@
return -1;
}
- info(DRIVER_VERSION " " DRIVER_AUTHOR);
- info(DRIVER_DESC);
+ info(DRIVER_VERSION ":" DRIVER_DESC);
return 0;
}
diff -u --recursive linux-2.4.6-1/drivers/usb/serial/visor.c
linux-2.4.6-1-usb/drivers/usb/serial/visor.c
--- linux-2.4.6-1/drivers/usb/serial/visor.c Wed Jun 6 21:58:15 2001
+++ linux-2.4.6-1-usb/drivers/usb/serial/visor.c Wed Jun 6 22:55:51 2001
@@ -764,8 +764,7 @@
}
}
- info(DRIVER_VERSION " " DRIVER_AUTHOR);
- info(DRIVER_DESC);
+ info(DRIVER_VERSION ":" DRIVER_DESC);
return 0;
}
diff -u --recursive linux-2.4.6-1/drivers/usb/serial/whiteheat.c
linux-2.4.6-1-usb/drivers/usb/serial/whiteheat.c
--- linux-2.4.6-1/drivers/usb/serial/whiteheat.c Wed Jun 6 21:57:48 2001
+++ linux-2.4.6-1-usb/drivers/usb/serial/whiteheat.c Wed Jun 6 22:55:55 2001
@@ -626,8 +626,7 @@
{
usb_serial_register (&whiteheat_fake_device);
usb_serial_register (&whiteheat_device);
- info(DRIVER_VERSION " " DRIVER_AUTHOR);
- info(DRIVER_DESC);
+ info(DRIVER_VERSION ":" DRIVER_DESC);
return 0;
}
diff -u --recursive linux-2.4.6-1/drivers/usb/uhci.c
linux-2.4.6-1-usb/drivers/usb/uhci.c
--- linux-2.4.6-1/drivers/usb/uhci.c Wed Jun 6 21:57:48 2001
+++ linux-2.4.6-1-usb/drivers/usb/uhci.c Wed Jun 6 22:54:06 2001
@@ -2990,8 +2990,7 @@
if (retval)
goto init_failed;
- info(DRIVER_VERSION " " DRIVER_AUTHOR);
- info(DRIVER_DESC);
+ info(DRIVER_VERSION ":" DRIVER_DESC);
return 0;
diff -u --recursive linux-2.4.6-1/drivers/usb/usb-ohci.c
linux-2.4.6-1-usb/drivers/usb/usb-ohci.c
--- linux-2.4.6-1/drivers/usb/usb-ohci.c Wed Jun 6 21:57:48 2001
+++ linux-2.4.6-1-usb/drivers/usb/usb-ohci.c Wed Jun 6 22:54:17 2001
@@ -2774,8 +2774,7 @@
#ifdef CONFIG_PMAC_PBOOK
pmu_register_sleep_notifier (&ohci_sleep_notifier);
#endif
- info(DRIVER_VERSION " " DRIVER_AUTHOR);
- info(DRIVER_DESC);
+ info(DRIVER_VERSION ":" DRIVER_DESC);
return ret;
}
diff -u --recursive linux-2.4.6-1/drivers/usb/usb-uhci.c
linux-2.4.6-1-usb/drivers/usb/usb-uhci.c
--- linux-2.4.6-1/drivers/usb/usb-uhci.c Wed Jun 6 21:57:48 2001
+++ linux-2.4.6-1-usb/drivers/usb/usb-uhci.c Wed Jun 6 22:54:11 2001
@@ -3108,8 +3108,7 @@
}
#endif
- info(DRIVER_VERSION " " DRIVER_AUTHOR);
- info(DRIVER_DESC);
+ info(DRIVER_VERSION ":" DRIVER_DESC);
return retval;
}
diff -u --recursive linux-2.4.6-1/drivers/usb/usbkbd.c
linux-2.4.6-1-usb/drivers/usb/usbkbd.c
--- linux-2.4.6-1/drivers/usb/usbkbd.c Wed Jun 6 21:57:48 2001
+++ linux-2.4.6-1-usb/drivers/usb/usbkbd.c Wed Jun 6 22:54:22 2001
@@ -280,8 +280,7 @@
static int __init usb_kbd_init(void)
{
usb_register(&usb_kbd_driver);
- info(DRIVER_VERSION " " DRIVER_AUTHOR);
- info(DRIVER_DESC);
+ info(DRIVER_VERSION ":" DRIVER_DESC);
return 0;
}
diff -u --recursive linux-2.4.6-1/drivers/usb/usbmouse.c
linux-2.4.6-1-usb/drivers/usb/usbmouse.c
--- linux-2.4.6-1/drivers/usb/usbmouse.c Wed Jun 6 21:57:48 2001
+++ linux-2.4.6-1-usb/drivers/usb/usbmouse.c Wed Jun 6 22:54:27 2001
@@ -194,8 +194,7 @@
static int __init usb_mouse_init(void)
{
usb_register(&usb_mouse_driver);
- info(DRIVER_VERSION " " DRIVER_AUTHOR);
- info(DRIVER_DESC);
+ info(DRIVER_VERSION ":" DRIVER_DESC);
return 0;
}
diff -u --recursive linux-2.4.6-1/drivers/usb/uss720.c
linux-2.4.6-1-usb/drivers/usb/uss720.c
--- linux-2.4.6-1/drivers/usb/uss720.c Wed Jun 6 21:57:48 2001
+++ linux-2.4.6-1-usb/drivers/usb/uss720.c Wed Jun 6 22:54:31 2001
@@ -659,8 +659,7 @@
if (usb_register(&uss720_driver) < 0)
return -1;
- info(DRIVER_VERSION " " DRIVER_AUTHOR);
- info(DRIVER_DESC);
+ info(DRIVER_VERSION ":" DRIVER_DESC);
return 0;
}
diff -u --recursive linux-2.4.6-1/drivers/usb/wacom.c
linux-2.4.6-1-usb/drivers/usb/wacom.c
--- linux-2.4.6-1/drivers/usb/wacom.c Wed Jun 6 21:57:48 2001
+++ linux-2.4.6-1-usb/drivers/usb/wacom.c Wed Jun 6 22:54:35 2001
@@ -415,8 +415,7 @@
static int __init wacom_init(void)
{
usb_register(&wacom_driver);
- info(DRIVER_VERSION " " DRIVER_AUTHOR);
- info(DRIVER_DESC);
+ info(DRIVER_VERSION ":" DRIVER_DESC);
return 0;
}
