aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/storage/freecom.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb/storage/freecom.c')
-rw-r--r--drivers/usb/storage/freecom.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/usb/storage/freecom.c b/drivers/usb/storage/freecom.c
index ef16068b7087..3f2b08966b9d 100644
--- a/drivers/usb/storage/freecom.c
+++ b/drivers/usb/storage/freecom.c
@@ -34,6 +34,9 @@
34#include "transport.h" 34#include "transport.h"
35#include "protocol.h" 35#include "protocol.h"
36#include "debug.h" 36#include "debug.h"
37#include "scsiglue.h"
38
39#define DRV_NAME "ums-freecom"
37 40
38MODULE_DESCRIPTION("Driver for Freecom USB/IDE adaptor"); 41MODULE_DESCRIPTION("Driver for Freecom USB/IDE adaptor");
39MODULE_AUTHOR("David Brown <usb-storage@davidb.org>"); 42MODULE_AUTHOR("David Brown <usb-storage@davidb.org>");
@@ -523,6 +526,8 @@ static void pdump(struct us_data *us, void *ibuffer, int length)
523} 526}
524#endif 527#endif
525 528
529static struct scsi_host_template freecom_host_template;
530
526static int freecom_probe(struct usb_interface *intf, 531static int freecom_probe(struct usb_interface *intf,
527 const struct usb_device_id *id) 532 const struct usb_device_id *id)
528{ 533{
@@ -530,7 +535,8 @@ static int freecom_probe(struct usb_interface *intf,
530 int result; 535 int result;
531 536
532 result = usb_stor_probe1(&us, intf, id, 537 result = usb_stor_probe1(&us, intf, id,
533 (id - freecom_usb_ids) + freecom_unusual_dev_list); 538 (id - freecom_usb_ids) + freecom_unusual_dev_list,
539 &freecom_host_template);
534 if (result) 540 if (result)
535 return result; 541 return result;
536 542
@@ -544,7 +550,7 @@ static int freecom_probe(struct usb_interface *intf,
544} 550}
545 551
546static struct usb_driver freecom_driver = { 552static struct usb_driver freecom_driver = {
547 .name = "ums-freecom", 553 .name = DRV_NAME,
548 .probe = freecom_probe, 554 .probe = freecom_probe,
549 .disconnect = usb_stor_disconnect, 555 .disconnect = usb_stor_disconnect,
550 .suspend = usb_stor_suspend, 556 .suspend = usb_stor_suspend,
@@ -557,4 +563,4 @@ static struct usb_driver freecom_driver = {
557 .no_dynamic_id = 1, 563 .no_dynamic_id = 1,
558}; 564};
559 565
560module_usb_driver(freecom_driver); 566module_usb_stor_driver(freecom_driver, freecom_host_template, DRV_NAME);