diff -Naur a/drivers/lirc_sasem/lirc_sasem.c b/drivers/lirc_sasem/lirc_sasem.c --- a/drivers/lirc_sasem/lirc_sasem.c 2012-09-23 17:54:11.000000000 +0200 +++ b/drivers/lirc_sasem/lirc_sasem.c 2012-09-23 18:03:20.327139095 +0200 @@ -210,7 +210,7 @@ retval = lirc_unregister_driver(minor); if (retval) - err("%s: unable to deregister from lirc (%d)", + printk(KERN_ERR KBUILD_MODNAME"%s: unable to deregister from lirc (%d)", __func__, retval); else printk(KERN_INFO "Deregistered Sasem driver (minor:%d)\n", @@ -235,7 +235,7 @@ subminor = iminor(inode); interface = usb_find_interface(&sasem_driver, subminor); if (!interface) { - err("%s: could not find interface for minor %d", + printk(KERN_ERR KBUILD_MODNAME"%s: could not find interface for minor %d", __func__, subminor); retval = -ENODEV; goto exit; @@ -243,7 +243,7 @@ context = usb_get_intfdata(interface); if (!context) { - err("%s: no context found for minor %d", + printk(KERN_ERR KBUILD_MODNAME"%s: no context found for minor %d", __func__, subminor); retval = -ENODEV; goto exit; @@ -252,7 +252,7 @@ mutex_lock(&context->lock); if (context->vfd_isopen) { - err("%s: VFD port is already open", __func__); + printk(KERN_ERR KBUILD_MODNAME"%s: VFD port is already open", __func__); retval = -EBUSY; } else { context->vfd_isopen = 1; @@ -283,7 +283,7 @@ context = (struct sasem_context *) file->private_data; if (!context) { - err("%s: no context for device", __func__); + printk(KERN_ERR KBUILD_MODNAME"%s: no context for device", __func__); return -ENODEV; } @@ -317,14 +317,14 @@ context = (struct sasem_context *) file->private_data; if (!context) { - err("%s: no context for device", __func__); + printk(KERN_ERR KBUILD_MODNAME"%s: no context for device", __func__); return -ENODEV; } mutex_lock(&context->lock); if (!context->vfd_isopen) { - err("%s: VFD is not open", __func__); + printk(KERN_ERR KBUILD_MODNAME"%s: VFD is not open", __func__); retval = -EIO; } else { context->vfd_isopen = 0; @@ -369,7 +369,7 @@ retval = usb_submit_urb(context->tx_urb, GFP_KERNEL); if (retval) { atomic_set(&(context->tx.busy), 0); - err("%s: error submitting urb (%d)", __func__, retval); + printk(KERN_ERR KBUILD_MODNAME"%s: error submitting urb (%d)", __func__, retval); } else { /* Wait for transmission to complete (or abort) */ mutex_unlock(&context->lock); @@ -378,7 +378,7 @@ retval = context->tx.status; if (retval) - err("%s: packet tx failed (%d)", __func__, retval); + printk(KERN_ERR KBUILD_MODNAME"%s: packet tx failed (%d)", __func__, retval); } return retval; @@ -398,20 +398,20 @@ context = (struct sasem_context *) file->private_data; if (!context) { - err("%s: no context for device", __func__); + printk(KERN_ERR KBUILD_MODNAME"%s: no context for device", __func__); return -ENODEV; } mutex_lock(&context->lock); if (!context->dev_present) { - err("%s: no Sasem device present", __func__); + printk(KERN_ERR KBUILD_MODNAME"%s: no Sasem device present", __func__); retval = -ENODEV; goto exit; } if (n_bytes <= 0 || n_bytes > 32) { - err("%s: invalid payload size", __func__); + printk(KERN_ERR KBUILD_MODNAME"%s: invalid payload size", __func__); retval = -EINVAL; goto exit; } @@ -466,7 +466,7 @@ retval = send_packet(context); if (retval) { - err("%s: send packet failed for packet #%d", + printk(KERN_ERR KBUILD_MODNAME"%s: send packet failed for packet #%d", __func__, i); goto exit; } @@ -520,7 +520,7 @@ mutex_lock(&context->lock); if (context->ir_isopen) { - err("%s: IR port is already open", __func__); + printk(KERN_ERR KBUILD_MODNAME"%s: IR port is already open", __func__); retval = -EBUSY; goto exit; } @@ -534,7 +534,7 @@ retval = usb_submit_urb(context->rx_urb, GFP_KERNEL); if (retval) - err("%s: usb_submit_urb failed for ir_open (%d)", + printk(KERN_ERR KBUILD_MODNAME"%s: usb_submit_urb failed for ir_open (%d)", __func__, retval); else { context->ir_isopen = 1; @@ -557,7 +557,7 @@ context = (struct sasem_context *)data; if (!context) { - err("%s: no context for device", __func__); + printk(KERN_ERR KBUILD_MODNAME"%s: no context for device", __func__); return; } @@ -767,7 +767,7 @@ /* Input endpoint is mandatory */ if (!ir_ep_found) { - err("%s: no valid input (IR) endpoint found.", __func__); + printk(KERN_ERR KBUILD_MODNAME"%s: no valid input (IR) endpoint found.", __func__); retval = -ENODEV; goto exit; } @@ -782,37 +782,37 @@ context = kzalloc(sizeof(struct sasem_context), GFP_KERNEL); if (!context) { - err("%s: kzalloc failed for context", __func__); + printk(KERN_ERR KBUILD_MODNAME"%s: kzalloc failed for context", __func__); alloc_status = 1; goto alloc_status_switch; } driver = kzalloc(sizeof(struct lirc_driver), GFP_KERNEL); if (!driver) { - err("%s: kzalloc failed for lirc_driver", __func__); + printk(KERN_ERR KBUILD_MODNAME"%s: kzalloc failed for lirc_driver", __func__); alloc_status = 2; goto alloc_status_switch; } rbuf = kmalloc(sizeof(struct lirc_buffer), GFP_KERNEL); if (!rbuf) { - err("%s: kmalloc failed for lirc_buffer", __func__); + printk(KERN_ERR KBUILD_MODNAME"%s: kmalloc failed for lirc_buffer", __func__); alloc_status = 3; goto alloc_status_switch; } if (lirc_buffer_init(rbuf, BUF_CHUNK_SIZE, BUF_SIZE)) { - err("%s: lirc_buffer_init failed", __func__); + printk(KERN_ERR KBUILD_MODNAME"%s: lirc_buffer_init failed", __func__); alloc_status = 4; goto alloc_status_switch; } rx_urb = usb_alloc_urb(0, GFP_KERNEL); if (!rx_urb) { - err("%s: usb_alloc_urb failed for IR urb", __func__); + printk(KERN_ERR KBUILD_MODNAME"%s: usb_alloc_urb failed for IR urb", __func__); alloc_status = 5; goto alloc_status_switch; } if (vfd_ep_found) { tx_urb = usb_alloc_urb(0, GFP_KERNEL); if (!tx_urb) { - err("%s: usb_alloc_urb failed for VFD urb", __func__); + printk(KERN_ERR KBUILD_MODNAME"%s: usb_alloc_urb failed for VFD urb", __func__); alloc_status = 6; goto alloc_status_switch; } @@ -836,7 +836,7 @@ lirc_minor = lirc_register_driver(driver); if (lirc_minor < 0) { - err("%s: lirc_register_driver failed", __func__); + printk(KERN_ERR KBUILD_MODNAME"%s: lirc_register_driver failed", __func__); alloc_status = 7; mutex_unlock(&context->lock); } else @@ -951,7 +951,7 @@ rc = usb_register(&sasem_driver); if (rc < 0) { - err("%s: usb register failed (%d)", __func__, rc); + printk(KERN_ERR KBUILD_MODNAME"%s: usb register failed (%d)", __func__, rc); return -ENODEV; } return 0; diff -Naur a/drivers/lirc_serial/lirc_serial.c b/drivers/lirc_serial/lirc_serial.c --- a/drivers/lirc_serial/lirc_serial.c 2012-09-23 17:54:11.000000000 +0200 +++ b/drivers/lirc_serial/lirc_serial.c 2012-09-23 18:08:26.395291298 +0200 @@ -66,7 +66,7 @@ #include #include -#include +//#include #include #include #include diff -Naur a/drivers/lirc_sir/lirc_sir.c b/drivers/lirc_sir/lirc_sir.c --- a/drivers/lirc_sir/lirc_sir.c 2012-09-23 17:54:11.000000000 +0200 +++ b/drivers/lirc_sir/lirc_sir.c 2012-09-23 18:08:48.651011505 +0200 @@ -59,7 +59,7 @@ #include #include #include -#include +//#include #include #include #include diff -Naur a/drivers/lirc_ttusbir/lirc_ttusbir.c b/drivers/lirc_ttusbir/lirc_ttusbir.c --- a/drivers/lirc_ttusbir/lirc_ttusbir.c 2012-09-23 17:54:11.000000000 +0200 +++ b/drivers/lirc_ttusbir/lirc_ttusbir.c 2012-09-23 18:09:50.986227846 +0200 @@ -124,7 +124,7 @@ for (i = 0; i < num_urbs; i++) { retval = usb_submit_urb(ttusbir->urb[i], GFP_KERNEL); if (retval) { - err("%s: usb_submit_urb failed on urb %d", + printk(KERN_ERR KBUILD_MODNAME"%s: usb_submit_urb failed on urb %d", __func__, i); return retval; } @@ -294,7 +294,7 @@ if (ttusbir->alt_setting != -1) DPRINTK("alt setting: %d\n", ttusbir->alt_setting); else { - err("Could not find alternate setting\n"); + printk(KERN_ERR KBUILD_MODNAME"Could not find alternate setting\n"); kfree(ttusbir); return -EINVAL; } @@ -307,7 +307,7 @@ /* Register as a LIRC driver */ if (lirc_buffer_init(&ttusbir->rbuf, sizeof(lirc_t), 256) < 0) { - err("Could not get memory for LIRC data buffer\n"); + printk(KERN_ERR KBUILD_MODNAME"Could not get memory for LIRC data buffer\n"); usb_set_intfdata(intf, NULL); kfree(ttusbir); return -ENOMEM; @@ -327,7 +327,7 @@ ttusbir->driver.features = LIRC_CAN_REC_MODE2; ttusbir->minor = lirc_register_driver(&ttusbir->driver); if (ttusbir->minor < 0) { - err("Error registering as LIRC driver\n"); + printk(KERN_ERR KBUILD_MODNAME"Error registering as LIRC driver\n"); usb_set_intfdata(intf, NULL); lirc_buffer_free(&ttusbir->rbuf); kfree(ttusbir); @@ -338,7 +338,7 @@ for (i = 0; i < num_urbs; i++) { ttusbir->urb[i] = usb_alloc_urb(8, GFP_KERNEL); if (!ttusbir->urb[i]) { - err("Could not allocate memory for the URB\n"); + printk(KERN_ERR KBUILD_MODNAME"Could not allocate memory for the URB\n"); for (j = i - 1; j >= 0; j--) kfree(ttusbir->urb[j]); lirc_buffer_free(&ttusbir->rbuf); @@ -398,7 +398,7 @@ /* register this driver with the USB subsystem */ result = usb_register(&usb_driver); if (result) - err("usb_register failed. Error number %d", result); + printk(KERN_ERR KBUILD_MODNAME"usb_register failed. Error number %d", result); return result; } --- lirc/drivers/lirc_imon/lirc_imon.c.orig 2013-03-09 18:28:15.000000000 +0100 +++ lirc/drivers/lirc_imon/lirc_imon.c 2013-03-09 19:25:58.000000000 +0100 @@ -447,7 +447,7 @@ retval = lirc_unregister_driver(minor); if (retval) - err("%s: unable to deregister from lirc(%d)", + printk(KERN_ERR KBUILD_MODNAME"%s: unable to deregister from lirc(%d)", __func__, retval); else printk(KERN_INFO MOD_NAME ": Deregistered iMON driver " @@ -472,7 +472,7 @@ subminor = iminor(inode); interface = usb_find_interface(&imon_driver, subminor); if (!interface) { - err("%s: could not find interface for minor %d", + printk(KERN_ERR KBUILD_MODNAME"%s: could not find interface for minor %d", __func__, subminor); retval = -ENODEV; goto exit; @@ -480,7 +480,7 @@ context = usb_get_intfdata(interface); if (!context) { - err("%s: no context found for minor %d", + printk(KERN_ERR KBUILD_MODNAME"%s: no context found for minor %d", __func__, subminor); retval = -ENODEV; goto exit; @@ -489,10 +489,10 @@ mutex_lock(&context->lock); if (!context->display_supported) { - err("%s: display not supported by device", __func__); + printk(KERN_ERR KBUILD_MODNAME"%s: display not supported by device", __func__); retval = -ENODEV; } else if (context->display_isopen) { - err("%s: display port is already open", __func__); + printk(KERN_ERR KBUILD_MODNAME"%s: display port is already open", __func__); retval = -EBUSY; } else { context->display_isopen = 1; @@ -519,17 +519,17 @@ context = (struct imon_context *)file->private_data; if (!context) { - err("%s: no context for device", __func__); + printk(KERN_ERR KBUILD_MODNAME"%s: no context for device", __func__); return -ENODEV; } mutex_lock(&context->lock); if (!context->display_supported) { - err("%s: display not supported by device", __func__); + printk(KERN_ERR KBUILD_MODNAME"%s: display not supported by device", __func__); retval = -ENODEV; } else if (!context->display_isopen) { - err("%s: display is not open", __func__); + printk(KERN_ERR KBUILD_MODNAME"%s: display is not open", __func__); retval = -EIO; } else { context->display_isopen = 0; @@ -565,7 +565,7 @@ /* Check if we need to use control or interrupt urb */ if (!context->tx_control) { if (!context->tx_endpoint) { - err("%s: device has no tx endpoint", __func__); + printk(KERN_ERR KBUILD_MODNAME"%s: device has no tx endpoint", __func__); return -EINVAL; } pipe = usb_sndintpipe(context->usbdev_intf0, @@ -610,19 +610,19 @@ retval = usb_submit_urb(context->tx_urb, GFP_KERNEL); if (retval) { atomic_set(&(context->tx.busy), 0); - err("%s: error submitting urb(%d)", __func__, retval); + printk(KERN_ERR KBUILD_MODNAME"%s: error submitting urb(%d)", __func__, retval); } else { /* Wait for transmission to complete (or abort) */ mutex_unlock(&context->lock); retval = wait_for_completion_interruptible( &context->tx.finished); if (retval) - err("%s: task interrupted", __func__); + printk(KERN_ERR KBUILD_MODNAME"%s: task interrupted", __func__); mutex_lock(&context->lock); retval = context->tx.status; if (retval) - err("%s: packet tx failed (%d)", __func__, retval); + printk(KERN_ERR KBUILD_MODNAME"%s: packet tx failed (%d)", __func__, retval); } kfree(control_req); @@ -654,12 +654,12 @@ 0x00, 0x00, 0x00, 0x20 }; if (!context) { - err("%s: no context for device", __func__); + printk(KERN_ERR KBUILD_MODNAME"%s: no context for device", __func__); return -ENODEV; } if (!context->dev_present_intf0) { - err("%s: no iMON device present", __func__); + printk(KERN_ERR KBUILD_MODNAME"%s: no iMON device present", __func__); return -ENODEV; } @@ -687,7 +687,7 @@ int i; if (!context) { - err("%s: no context for device", __func__); + printk(KERN_ERR KBUILD_MODNAME"%s: no context for device", __func__); return -ENODEV; } @@ -748,7 +748,7 @@ memcpy(context->usb_tx_buf, clock_enable_pkt[i], 8); retval = send_packet(context); if (retval) { - err("%s: send_packet failed for packet %d", + printk(KERN_ERR KBUILD_MODNAME"%s: send_packet failed for packet %d", __func__, i); break; } @@ -934,20 +934,20 @@ context = (struct imon_context *)file->private_data; if (!context) { - err("%s: no context for device", __func__); + printk(KERN_ERR KBUILD_MODNAME"%s: no context for device", __func__); return -ENODEV; } mutex_lock(&context->lock); if (!context->dev_present_intf0) { - err("%s: no iMON device present", __func__); + printk(KERN_ERR KBUILD_MODNAME"%s: no iMON device present", __func__); retval = -ENODEV; goto exit; } if (n_bytes <= 0 || n_bytes > 32) { - err("%s: invalid payload size", __func__); + printk(KERN_ERR KBUILD_MODNAME"%s: invalid payload size", __func__); retval = -EINVAL; goto exit; } @@ -973,7 +973,7 @@ retval = send_packet(context); if (retval) { - err("%s: send packet failed for packet #%d", + printk(KERN_ERR KBUILD_MODNAME"%s: send packet failed for packet #%d", __func__, seq/2); goto exit; } else { @@ -989,7 +989,7 @@ context->usb_tx_buf[7] = (unsigned char) seq; retval = send_packet(context); if (retval) - err("%s: send packet failed for packet #%d", + printk(KERN_ERR KBUILD_MODNAME"%s: send packet failed for packet #%d", __func__, seq/2); } @@ -1020,20 +1020,20 @@ context = (struct imon_context *)file->private_data; if (!context) { - err("%s: no context for device", __func__); + printk(KERN_ERR KBUILD_MODNAME"%s: no context for device", __func__); return -ENODEV; } mutex_lock(&context->lock); if (!context->display_supported) { - err("%s: no iMON display present", __func__); + printk(KERN_ERR KBUILD_MODNAME"%s: no iMON display present", __func__); retval = -ENODEV; goto exit; } if (n_bytes != 8) { - err("%s: invalid payload size: %d (expecting 8)", + printk(KERN_ERR KBUILD_MODNAME"%s: invalid payload size: %d (expecting 8)", __func__, (int) n_bytes); retval = -EINVAL; goto exit; @@ -1046,7 +1046,7 @@ retval = send_packet(context); if (retval) { - err("%s: send packet failed!", __func__); + printk(KERN_ERR KBUILD_MODNAME"%s: send packet failed!", __func__); goto exit; } else { dprintk("%s: write %d bytes to LCD\n", __func__, (int) n_bytes); @@ -1173,7 +1173,7 @@ context = (struct imon_context *)data; if (!context) { - err("%s: no context for device", __func__); + printk(KERN_ERR KBUILD_MODNAME"%s: no context for device", __func__); return; } @@ -1918,7 +1918,7 @@ /* Input endpoint is mandatory */ if (!ir_ep_found) { - err("%s: no valid input (IR) endpoint found.", __func__); + printk(KERN_ERR KBUILD_MODNAME"%s: no valid input (IR) endpoint found.", __func__); retval = -ENODEV; goto exit; } else { @@ -1942,36 +1942,36 @@ if (ifnum == 0) { context = kzalloc(sizeof(struct imon_context), GFP_KERNEL); if (!context) { - err("%s: kzalloc failed for context", __func__); + printk(KERN_ERR KBUILD_MODNAME"%s: kzalloc failed for context", __func__); alloc_status = 1; goto alloc_status_switch; } driver = kzalloc(sizeof(struct lirc_driver), GFP_KERNEL); if (!driver) { - err("%s: kzalloc failed for lirc_driver", __func__); + printk(KERN_ERR KBUILD_MODNAME"%s: kzalloc failed for lirc_driver", __func__); alloc_status = 2; goto alloc_status_switch; } rbuf = kmalloc(sizeof(struct lirc_buffer), GFP_KERNEL); if (!rbuf) { - err("%s: kmalloc failed for lirc_buffer", __func__); + printk(KERN_ERR KBUILD_MODNAME"%s: kmalloc failed for lirc_buffer", __func__); alloc_status = 3; goto alloc_status_switch; } if (lirc_buffer_init(rbuf, buf_chunk_size, BUF_SIZE)) { - err("%s: lirc_buffer_init failed", __func__); + printk(KERN_ERR KBUILD_MODNAME"%s: lirc_buffer_init failed", __func__); alloc_status = 4; goto alloc_status_switch; } rx_urb = usb_alloc_urb(0, GFP_KERNEL); if (!rx_urb) { - err("%s: usb_alloc_urb failed for IR urb", __func__); + printk(KERN_ERR KBUILD_MODNAME"%s: usb_alloc_urb failed for IR urb", __func__); alloc_status = 5; goto alloc_status_switch; } tx_urb = usb_alloc_urb(0, GFP_KERNEL); if (!tx_urb) { - err("%s: usb_alloc_urb failed for display urb", + printk(KERN_ERR KBUILD_MODNAME"%s: usb_alloc_urb failed for display urb", __func__); alloc_status = 6; goto alloc_status_switch; @@ -2007,7 +2007,7 @@ lirc_minor = lirc_register_driver(driver); if (lirc_minor < 0) { - err("%s: lirc_register_driver failed", __func__); + printk(KERN_ERR KBUILD_MODNAME"%s: lirc_register_driver failed", __func__); alloc_status = 7; goto alloc_status_switch; } else @@ -2022,7 +2022,7 @@ if (first_if_context->driver) { rx_urb = usb_alloc_urb(0, GFP_KERNEL); if (!rx_urb) { - err("%s: usb_alloc_urb failed for IR urb", + printk(KERN_ERR KBUILD_MODNAME"%s: usb_alloc_urb failed for IR urb", __func__); alloc_status = 5; goto alloc_status_switch; @@ -2093,7 +2093,7 @@ retval = usb_submit_urb(context->rx_urb_intf0, GFP_KERNEL); if (retval) { - err("%s: usb_submit_urb failed for intf0 (%d)", + printk(KERN_ERR KBUILD_MODNAME"%s: usb_submit_urb failed for intf0 (%d)", __func__, retval); mutex_unlock(&context->lock); goto exit; @@ -2149,7 +2149,7 @@ retval = usb_submit_urb(context->rx_urb_intf1, GFP_KERNEL); if (retval) { - err("%s: usb_submit_urb failed for intf1 (%d)", + printk(KERN_ERR KBUILD_MODNAME"%s: usb_submit_urb failed for intf1 (%d)", __func__, retval); mutex_unlock(&context->lock); goto exit; @@ -2163,7 +2163,7 @@ sysfs_err = sysfs_create_group(&interface->dev.kobj, &imon_rf_attribute_group); if (sysfs_err) - err("%s: Could not create RF sysfs entries(%d)", + printk(KERN_ERR KBUILD_MODNAME"%s: Could not create RF sysfs entries(%d)", __func__, sysfs_err); } @@ -2174,7 +2174,7 @@ sysfs_err = sysfs_create_group(&interface->dev.kobj, &imon_display_attribute_group); if (sysfs_err) - err("%s: Could not create display sysfs entries(%d)", + printk(KERN_ERR KBUILD_MODNAME"%s: Could not create display sysfs entries(%d)", __func__, sysfs_err); if (usb_register_dev(interface, &imon_class)) { @@ -2344,7 +2344,7 @@ rc = usb_register(&imon_driver); if (rc) { - err("%s: usb register failed(%d)", __func__, rc); + printk(KERN_ERR KBUILD_MODNAME"%s: usb register failed(%d)", __func__, rc); return -ENODEV; }