From 62dab3aa356e68e344aee408dfe470a95816c574 Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Wed, 1 Apr 2009 11:27:00 +0000 Subject: [PATCH] Changes for 2.6.29 kernel. info() removed from . --- comedi/drivers/dt9812.c | 4 ++-- comedi/drivers/usbdux.c | 3 ++- comedi/drivers/usbduxfast.c | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/comedi/drivers/dt9812.c b/comedi/drivers/dt9812.c index c3e8a60b..8afb9cb9 100644 --- a/comedi/drivers/dt9812.c +++ b/comedi/drivers/dt9812.c @@ -609,7 +609,7 @@ static int dt9812_probe(struct usb_interface *interface, usb_set_intfdata(interface, dev); // let the user know what node this device is now attached to - info("USB DT9812 (%4.4x.%4.4x.%4.4x) #0x%8.8x", + dev_info(&interface->dev, "USB DT9812 (%4.4x.%4.4x.%4.4x) #0x%8.8x\n", dev->vendor, dev->product, dev->device, dev->serial); down(&dt9812_mutex); @@ -668,7 +668,7 @@ static void dt9812_disconnect(struct usb_interface *interface) /* queue final destruction */ kref_put(&dev->kref, dt9812_delete); - info("USB Dt9812 #%d now disconnected", minor); + dev_info(&interface->dev, "USB Dt9812 #%d now disconnected\n", minor); } static struct usb_driver dt9812_usb_driver = { diff --git a/comedi/drivers/usbdux.c b/comedi/drivers/usbdux.c index 14202a15..11e9572c 100644 --- a/comedi/drivers/usbdux.c +++ b/comedi/drivers/usbdux.c @@ -2992,7 +2992,8 @@ static struct usb_driver usbduxsub_driver = { // registering the usb-system _and_ the comedi-driver static int init_usbdux(void) { - info(DRIVER_VERSION ":" DRIVER_DESC); + printk(KERN_INFO KBUILD_MODNAME ": " + DRIVER_VERSION ":" DRIVER_DESC "\n"); init_usb_devices(); usb_register(&usbduxsub_driver); comedi_driver_register(&driver_usbdux); diff --git a/comedi/drivers/usbduxfast.c b/comedi/drivers/usbduxfast.c index a42efb8d..c20c769f 100644 --- a/comedi/drivers/usbduxfast.c +++ b/comedi/drivers/usbduxfast.c @@ -1791,7 +1791,8 @@ static struct usb_driver usbduxfastsub_driver = { // registering the usb-system _and_ the comedi-driver static int init_usbduxfast(void) { - info(DRIVER_VERSION ":" DRIVER_DESC); + printk(KERN_INFO KBUILD_MODNAME ": " + DRIVER_VERSION ":" DRIVER_DESC "\n"); init_usb_devices(); usb_register(&usbduxfastsub_driver); comedi_driver_register(&driver_usbduxfast); -- 2.26.2