Skip to content

L
linux
Commit ececd9bc authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files
Options

USB whiteheat driver: changes due to the usb-serial api changes. 

	- moved the firmware download to probe() time
parent 5e0dd8c0
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 15 deletions
drivers/usb/serial/whiteheat.c
View file @ ececd9bc
...@@ -125,9 +125,9 @@ static int whiteheat_ioctl (struct usb_serial_port *port, struct file * file, ...@@ -125,9 +125,9 @@ static int whiteheat_ioctl (struct usb_serial_port *port, struct file * file,
static void whiteheat_set_termios (struct usb_serial_port *port, struct termios * old); static void whiteheat_set_termios (struct usb_serial_port *port, struct termios * old);
static void whiteheat_throttle (struct usb_serial_port *port); static void whiteheat_throttle (struct usb_serial_port *port);
static void whiteheat_unthrottle (struct usb_serial_port *port); static void whiteheat_unthrottle (struct usb_serial_port *port);
static int whiteheat_fake_startup (struct usb_serial *serial); static int whiteheat_firmware_download (struct usb_serial *serial);
static int whiteheat_real_startup (struct usb_serial *serial); static int whiteheat_attach (struct usb_serial *serial);
static void whiteheat_real_shutdown (struct usb_serial *serial); static void whiteheat_shutdown (struct usb_serial *serial);
static struct usb_serial_device_type whiteheat_fake_device = { static struct usb_serial_device_type whiteheat_fake_device = {
owner: THIS_MODULE, owner: THIS_MODULE,
...@@ -137,7 +137,7 @@ static struct usb_serial_device_type whiteheat_fake_device = { ...@@ -137,7 +137,7 @@ static struct usb_serial_device_type whiteheat_fake_device = {
num_bulk_in: NUM_DONT_CARE, num_bulk_in: NUM_DONT_CARE,
num_bulk_out: NUM_DONT_CARE, num_bulk_out: NUM_DONT_CARE,
num_ports: 1, num_ports: 1,
startup: whiteheat_fake_startup, probe: whiteheat_firmware_download,
}; };
static struct usb_serial_device_type whiteheat_device = { static struct usb_serial_device_type whiteheat_device = {
...@@ -154,8 +154,8 @@ static struct usb_serial_device_type whiteheat_device = { ...@@ -154,8 +154,8 @@ static struct usb_serial_device_type whiteheat_device = {
unthrottle: whiteheat_unthrottle, unthrottle: whiteheat_unthrottle,
ioctl: whiteheat_ioctl, ioctl: whiteheat_ioctl,
set_termios: whiteheat_set_termios, set_termios: whiteheat_set_termios,
startup: whiteheat_real_startup, attach: whiteheat_attach,
shutdown: whiteheat_real_shutdown, shutdown: whiteheat_shutdown,
}; };
struct whiteheat_private { struct whiteheat_private {
...@@ -504,7 +504,7 @@ static void whiteheat_unthrottle (struct usb_serial_port *port) ...@@ -504,7 +504,7 @@ static void whiteheat_unthrottle (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_fake_startup (struct usb_serial *serial) static int whiteheat_firmware_download (struct usb_serial *serial)
{ {
int response; int response;
const struct whiteheat_hex_record *record; const struct whiteheat_hex_record *record;
...@@ -518,8 +518,8 @@ static int whiteheat_fake_startup (struct usb_serial *serial) ...@@ -518,8 +518,8 @@ static int whiteheat_fake_startup (struct usb_serial *serial)
response = ezusb_writememory (serial, record->address, response = ezusb_writememory (serial, record->address,
(unsigned char *)record->data, record->data_size, 0xa0); (unsigned char *)record->data, record->data_size, 0xa0);
if (response < 0) { if (response < 0) {
err(__FUNCTION__ " - ezusb_writememory failed for loader (%d %04X %p %d)", err("%s - ezusb_writememory failed for loader (%d %04X %p %d)",
response, record->address, record->data, record->data_size); __FUNCTION__, response, record->address, record->data, record->data_size);
break; break;
} }
++record; ++record;
...@@ -535,8 +535,8 @@ static int whiteheat_fake_startup (struct usb_serial *serial) ...@@ -535,8 +535,8 @@ static int whiteheat_fake_startup (struct usb_serial *serial)
response = ezusb_writememory (serial, record->address, response = ezusb_writememory (serial, record->address,
(unsigned char *)record->data, record->data_size, 0xa3); (unsigned char *)record->data, record->data_size, 0xa3);
if (response < 0) { if (response < 0) {
err(__FUNCTION__ " - ezusb_writememory failed for first firmware step (%d %04X %p %d)", err("%s - ezusb_writememory failed for first firmware step (%d %04X %p %d)",
response, record->address, record->data, record->data_size); __FUNCTION__, response, record->address, record->data, record->data_size);
break; break;
} }
++record; ++record;
...@@ -549,8 +549,8 @@ static int whiteheat_fake_startup (struct usb_serial *serial) ...@@ -549,8 +549,8 @@ static int whiteheat_fake_startup (struct usb_serial *serial)
response = ezusb_writememory (serial, record->address, response = ezusb_writememory (serial, record->address,
(unsigned char *)record->data, record->data_size, 0xa0); (unsigned char *)record->data, record->data_size, 0xa0);
if (response < 0) { if (response < 0) {
err(__FUNCTION__" - ezusb_writememory failed for second firmware step (%d %04X %p %d)", err("%s - ezusb_writememory failed for second firmware step (%d %04X %p %d)",
response, record->address, record->data, record->data_size); __FUNCTION__, response, record->address, record->data, record->data_size);
break; break;
} }
++record; ++record;
...@@ -563,7 +563,7 @@ static int whiteheat_fake_startup (struct usb_serial *serial) ...@@ -563,7 +563,7 @@ static int whiteheat_fake_startup (struct usb_serial *serial)
} }
static int whiteheat_real_startup (struct usb_serial *serial) static int whiteheat_attach (struct usb_serial *serial)
{ {
struct whiteheat_hw_info *hw_info; struct whiteheat_hw_info *hw_info;
int pipe; int pipe;
...@@ -622,7 +622,7 @@ static int whiteheat_real_startup (struct usb_serial *serial) ...@@ -622,7 +622,7 @@ static int whiteheat_real_startup (struct usb_serial *serial)
return 0; return 0;
} }
static void whiteheat_real_shutdown (struct usb_serial *serial) static void whiteheat_shutdown (struct usb_serial *serial)
{ {
struct usb_serial_port *command_port; struct usb_serial_port *command_port;
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7