aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/keyspan.c
diff options
context:
space:
mode:
authorRene Buergel <rene.buergel@sohard.de>2012-09-13 16:14:38 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-14 00:59:51 -0400
commit99495c7061892f0312c0119725b550bb221634ce (patch)
treecde4743b6d5461d666f5158080a24dba057abfe6 /drivers/usb/serial/keyspan.c
parent8321652ae22f38830af5b553f3a316d68948ddce (diff)
USB: ezusb: remove dependancy on usb_serial
This patch removes the dependency on the usb_serial interface and names some magic constants Signed-off-by: René Bürgel <rene.buergel@sohard.de> -- Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial/keyspan.c')
-rw-r--r--drivers/usb/serial/keyspan.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c
index af0b70eaf03..f0d4f3fcf4f 100644
--- a/drivers/usb/serial/keyspan.c
+++ b/drivers/usb/serial/keyspan.c
@@ -1241,12 +1241,12 @@ static int keyspan_fake_startup(struct usb_serial *serial)
1241 dbg("Uploading Keyspan %s firmware.", fw_name); 1241 dbg("Uploading Keyspan %s firmware.", fw_name);
1242 1242
1243 /* download the firmware image */ 1243 /* download the firmware image */
1244 response = ezusb_set_reset(serial, 1); 1244 response = ezusb_set_reset(serial->dev, 1);
1245 1245
1246 record = (const struct ihex_binrec *)fw->data; 1246 record = (const struct ihex_binrec *)fw->data;
1247 1247
1248 while (record) { 1248 while (record) {
1249 response = ezusb_writememory(serial, be32_to_cpu(record->addr), 1249 response = ezusb_writememory(serial->dev, be32_to_cpu(record->addr),
1250 (unsigned char *)record->data, 1250 (unsigned char *)record->data,
1251 be16_to_cpu(record->len), 0xa0); 1251 be16_to_cpu(record->len), 0xa0);
1252 if (response < 0) { 1252 if (response < 0) {
@@ -1260,7 +1260,7 @@ static int keyspan_fake_startup(struct usb_serial *serial)
1260 release_firmware(fw); 1260 release_firmware(fw);
1261 /* bring device out of reset. Renumeration will occur in a 1261 /* bring device out of reset. Renumeration will occur in a
1262 moment and the new device will bind to the real driver */ 1262 moment and the new device will bind to the real driver */
1263 response = ezusb_set_reset(serial, 0); 1263 response = ezusb_set_reset(serial->dev, 0);
1264 1264
1265 /* we don't want this device to have a driver assigned to it. */ 1265 /* we don't want this device to have a driver assigned to it. */
1266 return 1; 1266 return 1;