aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/keyspan.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-14 19:30:23 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-14 19:30:23 -0400
commit049c6b4e8f85d9ef5f26c8a974e5e9fb084f8ce0 (patch)
treeeb8ed1608f26242f8af733a267b68c3de2e1ab87 /drivers/usb/serial/keyspan.h
parent9c134a14f2da1631d583090a898a8b9d40930472 (diff)
USB: serial: keyspan: remove dbg() usage
dbg() was a very old USB-serial-specific macro. This patch removes it from being used in the keyspan driver and uses dev_dbg() instead. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial/keyspan.h')
-rw-r--r--drivers/usb/serial/keyspan.h17
1 files changed, 11 insertions, 6 deletions
diff --git a/drivers/usb/serial/keyspan.h b/drivers/usb/serial/keyspan.h
index fe1c5d91692c..0a8a40b5711e 100644
--- a/drivers/usb/serial/keyspan.h
+++ b/drivers/usb/serial/keyspan.h
@@ -64,19 +64,23 @@ static int keyspan_tiocmset (struct tty_struct *tty,
64 unsigned int clear); 64 unsigned int clear);
65static int keyspan_fake_startup (struct usb_serial *serial); 65static int keyspan_fake_startup (struct usb_serial *serial);
66 66
67static int keyspan_usa19_calc_baud (u32 baud_rate, u32 baudclk, 67static int keyspan_usa19_calc_baud (struct usb_serial_port *port,
68 u32 baud_rate, u32 baudclk,
68 u8 *rate_hi, u8 *rate_low, 69 u8 *rate_hi, u8 *rate_low,
69 u8 *prescaler, int portnum); 70 u8 *prescaler, int portnum);
70 71
71static int keyspan_usa19w_calc_baud (u32 baud_rate, u32 baudclk, 72static int keyspan_usa19w_calc_baud (struct usb_serial_port *port,
73 u32 baud_rate, u32 baudclk,
72 u8 *rate_hi, u8 *rate_low, 74 u8 *rate_hi, u8 *rate_low,
73 u8 *prescaler, int portnum); 75 u8 *prescaler, int portnum);
74 76
75static int keyspan_usa28_calc_baud (u32 baud_rate, u32 baudclk, 77static int keyspan_usa28_calc_baud (struct usb_serial_port *port,
78 u32 baud_rate, u32 baudclk,
76 u8 *rate_hi, u8 *rate_low, 79 u8 *rate_hi, u8 *rate_low,
77 u8 *prescaler, int portnum); 80 u8 *prescaler, int portnum);
78 81
79static int keyspan_usa19hs_calc_baud (u32 baud_rate, u32 baudclk, 82static int keyspan_usa19hs_calc_baud (struct usb_serial_port *port,
83 u32 baud_rate, u32 baudclk,
80 u8 *rate_hi, u8 *rate_low, 84 u8 *rate_hi, u8 *rate_low,
81 u8 *prescaler, int portnum); 85 u8 *prescaler, int portnum);
82 86
@@ -188,8 +192,9 @@ struct keyspan_device_details {
188 /* Endpoint used for global control functions */ 192 /* Endpoint used for global control functions */
189 int glocont_endpoint; 193 int glocont_endpoint;
190 194
191 int (*calculate_baud_rate) (u32 baud_rate, u32 baudclk, 195 int (*calculate_baud_rate) (struct usb_serial_port *port,
192 u8 *rate_hi, u8 *rate_low, u8 *prescaler, int portnum); 196 u32 baud_rate, u32 baudclk,
197 u8 *rate_hi, u8 *rate_low, u8 *prescaler, int portnum);
193 u32 baudclk; 198 u32 baudclk;
194}; 199};
195 200