Commit 9932a78d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

[PATCH] USB serial: fixup for probe function paramaters changing.

parent 86b0ac2f
...@@ -168,7 +168,7 @@ static int visor_write_room (struct usb_serial_port *port); ...@@ -168,7 +168,7 @@ static int visor_write_room (struct usb_serial_port *port);
static int visor_chars_in_buffer (struct usb_serial_port *port); static int visor_chars_in_buffer (struct usb_serial_port *port);
static void visor_throttle (struct usb_serial_port *port); static void visor_throttle (struct usb_serial_port *port);
static void visor_unthrottle (struct usb_serial_port *port); static void visor_unthrottle (struct usb_serial_port *port);
static int visor_probe (struct usb_serial *serial); static int visor_probe (struct usb_serial *serial, const struct usb_device_id *id);
static int visor_calc_num_ports(struct usb_serial *serial); static int visor_calc_num_ports(struct usb_serial *serial);
static void visor_shutdown (struct usb_serial *serial); static void visor_shutdown (struct usb_serial *serial);
static int visor_ioctl (struct usb_serial_port *port, struct file * file, unsigned int cmd, unsigned long arg); static int visor_ioctl (struct usb_serial_port *port, struct file * file, unsigned int cmd, unsigned long arg);
...@@ -600,7 +600,7 @@ static void visor_unthrottle (struct usb_serial_port *port) ...@@ -600,7 +600,7 @@ static void visor_unthrottle (struct usb_serial_port *port)
dev_err(&port->dev, "%s - failed submitting read urb, error %d\n", __FUNCTION__, result); dev_err(&port->dev, "%s - failed submitting read urb, error %d\n", __FUNCTION__, result);
} }
static int visor_probe (struct usb_serial *serial) static int visor_probe (struct usb_serial *serial, const struct usb_device_id *id)
{ {
struct device *dev = &serial->dev->dev; struct device *dev = &serial->dev->dev;
int response; int response;
......
...@@ -134,7 +134,7 @@ static struct usb_driver whiteheat_driver = { ...@@ -134,7 +134,7 @@ static struct usb_driver whiteheat_driver = {
}; };
/* function prototypes for the Connect Tech WhiteHEAT prerenumeration device */ /* function prototypes for the Connect Tech WhiteHEAT prerenumeration device */
static int whiteheat_firmware_download (struct usb_serial *serial); static int whiteheat_firmware_download (struct usb_serial *serial, const struct usb_device_id *id);
static int whiteheat_firmware_attach (struct usb_serial *serial); static int whiteheat_firmware_attach (struct usb_serial *serial);
/* function prototypes for the Connect Tech WhiteHEAT serial converter */ /* function prototypes for the Connect Tech WhiteHEAT serial converter */
...@@ -269,7 +269,7 @@ static int firm_report_tx_done(struct usb_serial_port *port); ...@@ -269,7 +269,7 @@ static int firm_report_tx_done(struct usb_serial_port *port);
- device renumerated itself and comes up as new device id with all - device renumerated itself and comes up as new device id with all
firmware download completed. firmware download completed.
*/ */
static int whiteheat_firmware_download (struct usb_serial *serial) static int whiteheat_firmware_download (struct usb_serial *serial, const struct usb_device_id *id)
{ {
int response; int response;
const struct whiteheat_hex_record *record; const struct whiteheat_hex_record *record;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment