USB: serial: remove dbg() from usb/serial.h

[firefly-linux-kernel-4.4.55.git] / include / linux / usb / serial.h

diff --git a/include/linux/usb/serial.h b/include/linux/usb/serial.h
index 86c0b451745d432dd7362e2259ad1cde7c33ad31..e71bc5ef234aabc0eccd2ad22bb29e80c7bbc873 100644 (file)
--- a/include/linux/usb/serial.h
+++ b/include/linux/usb/serial.h
@@ -301,9 +301,9 @@ extern void usb_serial_port_softint(struct usb_serial_port *port);
 extern int usb_serial_suspend(struct usb_interface *intf, pm_message_t message);
 extern int usb_serial_resume(struct usb_interface *intf);
 
-extern int ezusb_writememory(struct usb_serial *serial, int address,
+extern int ezusb_writememory(struct usb_device *dev, int address,
                             unsigned char *data, int length, __u8 bRequest);
-extern int ezusb_set_reset(struct usb_serial *serial, unsigned char reset_bit);
+extern int ezusb_set_reset(struct usb_device *dev, unsigned char reset_bit);
 
 /* USB Serial console functions */
 #ifdef CONFIG_USB_SERIAL_CONSOLE
@@ -360,25 +360,11 @@ static inline void usb_serial_debug_data(int debug,
                                         const char *function, int size,
                                         const unsigned char *data)
 {
-       int i;
-
-       if (debug) {
-               dev_printk(KERN_DEBUG, dev, "%s - length = %d, data = ",
-                          function, size);
-               for (i = 0; i < size; ++i)
-                       printk("%.2x ", data[i]);
-               printk("\n");
-       }
+       if (debug)
+               dev_printk(KERN_DEBUG, dev, "%s - length = %d, data = %*ph\n",
+                          function, size, size, data);
 }
 
-/* Use our own dbg macro */
-#undef dbg
-#define dbg(format, arg...)                                            \
-do {                                                                   \
-       if (debug)                                                      \
-               printk(KERN_DEBUG "%s: " format "\n", __FILE__, ##arg); \
-} while (0)
-
 /*
  * Macro for reporting errors in write path to avoid inifinite loop
  * when port is used as a console.