diff options
-rw-r--r-- | drivers/input/misc/cm109.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/drivers/input/misc/cm109.c b/drivers/input/misc/cm109.c index 1166e8443304..bce160f4349b 100644 --- a/drivers/input/misc/cm109.c +++ b/drivers/input/misc/cm109.c | |||
@@ -36,8 +36,6 @@ | |||
36 | #include <linux/rwsem.h> | 36 | #include <linux/rwsem.h> |
37 | #include <linux/usb/input.h> | 37 | #include <linux/usb/input.h> |
38 | 38 | ||
39 | #define CM109_DEBUG 0 | ||
40 | |||
41 | #define DRIVER_VERSION "20080805" | 39 | #define DRIVER_VERSION "20080805" |
42 | #define DRIVER_AUTHOR "Alfred E. Heggestad" | 40 | #define DRIVER_AUTHOR "Alfred E. Heggestad" |
43 | #define DRIVER_DESC "CM109 phone driver" | 41 | #define DRIVER_DESC "CM109 phone driver" |
@@ -311,7 +309,7 @@ static void cm109_urb_irq_callback(struct urb *urb) | |||
311 | const int status = urb->status; | 309 | const int status = urb->status; |
312 | int error; | 310 | int error; |
313 | 311 | ||
314 | dev_dbg(&urb->dev->dev, "### URB IRQ: [0x%02x 0x%02x 0x%02x 0x%02x] keybit=0x%02x", | 312 | dev_dbg(&urb->dev->dev, "### URB IRQ: [0x%02x 0x%02x 0x%02x 0x%02x] keybit=0x%02x\n", |
315 | dev->irq_data->byte[0], | 313 | dev->irq_data->byte[0], |
316 | dev->irq_data->byte[1], | 314 | dev->irq_data->byte[1], |
317 | dev->irq_data->byte[2], | 315 | dev->irq_data->byte[2], |
@@ -381,7 +379,7 @@ static void cm109_urb_ctl_callback(struct urb *urb) | |||
381 | const int status = urb->status; | 379 | const int status = urb->status; |
382 | int error; | 380 | int error; |
383 | 381 | ||
384 | dev_dbg(&urb->dev->dev, "### URB CTL: [0x%02x 0x%02x 0x%02x 0x%02x]", | 382 | dev_dbg(&urb->dev->dev, "### URB CTL: [0x%02x 0x%02x 0x%02x 0x%02x]\n", |
385 | dev->ctl_data->byte[0], | 383 | dev->ctl_data->byte[0], |
386 | dev->ctl_data->byte[1], | 384 | dev->ctl_data->byte[1], |
387 | dev->ctl_data->byte[2], | 385 | dev->ctl_data->byte[2], |
@@ -546,7 +544,7 @@ static int cm109_input_ev(struct input_dev *idev, unsigned int type, | |||
546 | struct cm109_dev *dev = input_get_drvdata(idev); | 544 | struct cm109_dev *dev = input_get_drvdata(idev); |
547 | 545 | ||
548 | dev_dbg(&dev->udev->dev, | 546 | dev_dbg(&dev->udev->dev, |
549 | "input_ev: type=%u code=%u value=%d", type, code, value); | 547 | "input_ev: type=%u code=%u value=%d\n", type, code, value); |
550 | 548 | ||
551 | if (type != EV_SND) | 549 | if (type != EV_SND) |
552 | return -EINVAL; | 550 | return -EINVAL; |
@@ -760,7 +758,7 @@ static int cm109_usb_suspend(struct usb_interface *intf, pm_message_t message) | |||
760 | { | 758 | { |
761 | struct cm109_dev *dev = usb_get_intfdata(intf); | 759 | struct cm109_dev *dev = usb_get_intfdata(intf); |
762 | 760 | ||
763 | dev_info(&intf->dev, "cm109: usb_suspend (event=%d)", message.event); | 761 | dev_info(&intf->dev, "cm109: usb_suspend (event=%d)\n", message.event); |
764 | 762 | ||
765 | mutex_lock(&dev->pm_mutex); | 763 | mutex_lock(&dev->pm_mutex); |
766 | cm109_stop_traffic(dev); | 764 | cm109_stop_traffic(dev); |
@@ -773,7 +771,7 @@ static int cm109_usb_resume(struct usb_interface *intf) | |||
773 | { | 771 | { |
774 | struct cm109_dev *dev = usb_get_intfdata(intf); | 772 | struct cm109_dev *dev = usb_get_intfdata(intf); |
775 | 773 | ||
776 | dev_info(&intf->dev, "cm109: usb_resume"); | 774 | dev_info(&intf->dev, "cm109: usb_resume\n"); |
777 | 775 | ||
778 | mutex_lock(&dev->pm_mutex); | 776 | mutex_lock(&dev->pm_mutex); |
779 | cm109_restore_state(dev); | 777 | cm109_restore_state(dev); |
@@ -833,18 +831,18 @@ static int __init cm109_select_keymap(void) | |||
833 | if (!strcasecmp(phone, "kip1000")) { | 831 | if (!strcasecmp(phone, "kip1000")) { |
834 | keymap = keymap_kip1000; | 832 | keymap = keymap_kip1000; |
835 | printk(KERN_INFO KBUILD_MODNAME ": " | 833 | printk(KERN_INFO KBUILD_MODNAME ": " |
836 | "Keymap for Komunikate KIP1000 phone loaded"); | 834 | "Keymap for Komunikate KIP1000 phone loaded\n"); |
837 | } else if (!strcasecmp(phone, "gtalk")) { | 835 | } else if (!strcasecmp(phone, "gtalk")) { |
838 | keymap = keymap_gtalk; | 836 | keymap = keymap_gtalk; |
839 | printk(KERN_INFO KBUILD_MODNAME ": " | 837 | printk(KERN_INFO KBUILD_MODNAME ": " |
840 | "Keymap for Genius G-talk phone loaded"); | 838 | "Keymap for Genius G-talk phone loaded\n"); |
841 | } else if (!strcasecmp(phone, "usbph01")) { | 839 | } else if (!strcasecmp(phone, "usbph01")) { |
842 | keymap = keymap_usbph01; | 840 | keymap = keymap_usbph01; |
843 | printk(KERN_INFO KBUILD_MODNAME ": " | 841 | printk(KERN_INFO KBUILD_MODNAME ": " |
844 | "Keymap for Allied-Telesis Corega USBPH01 phone loaded"); | 842 | "Keymap for Allied-Telesis Corega USBPH01 phone loaded\n"); |
845 | } else { | 843 | } else { |
846 | printk(KERN_ERR KBUILD_MODNAME ": " | 844 | printk(KERN_ERR KBUILD_MODNAME ": " |
847 | "Unsupported phone: %s", phone); | 845 | "Unsupported phone: %s\n", phone); |
848 | return -EINVAL; | 846 | return -EINVAL; |
849 | } | 847 | } |
850 | 848 | ||
@@ -864,7 +862,7 @@ static int __init cm109_init(void) | |||
864 | return err; | 862 | return err; |
865 | 863 | ||
866 | printk(KERN_INFO KBUILD_MODNAME ": " | 864 | printk(KERN_INFO KBUILD_MODNAME ": " |
867 | DRIVER_DESC ": " DRIVER_VERSION " (C) " DRIVER_AUTHOR); | 865 | DRIVER_DESC ": " DRIVER_VERSION " (C) " DRIVER_AUTHOR "\n"); |
868 | 866 | ||
869 | return 0; | 867 | return 0; |
870 | } | 868 | } |