diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 12:53:38 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 12:53:38 -0400 |
commit | bceadddd92ceb4fd51e5e16c4f6699d8eb2e5604 (patch) | |
tree | 1d78e7375c4d54ce2aab44fe9f6e88a86a229707 | |
parent | e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (diff) |
Staging: keucr: fix up US_ macro change
The usb tree renamed the USB storage defines to make more sense, so this
driver needs the changes as well so that things will compile properly.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/staging/keucr/scsiglue.c | 6 | ||||
-rw-r--r-- | drivers/staging/keucr/transport.c | 4 | ||||
-rw-r--r-- | drivers/staging/keucr/usb.c | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/drivers/staging/keucr/scsiglue.c b/drivers/staging/keucr/scsiglue.c index d830348ed01..a2671404f7a 100644 --- a/drivers/staging/keucr/scsiglue.c +++ b/drivers/staging/keucr/scsiglue.c | |||
@@ -30,7 +30,7 @@ static int slave_alloc(struct scsi_device *sdev) | |||
30 | 30 | ||
31 | blk_queue_update_dma_alignment(sdev->request_queue, (512 - 1)); | 31 | blk_queue_update_dma_alignment(sdev->request_queue, (512 - 1)); |
32 | 32 | ||
33 | if (us->subclass == US_SC_UFI) | 33 | if (us->subclass == USB_SC_UFI) |
34 | sdev->sdev_target->pdt_1f_for_no_lun = 1; | 34 | sdev->sdev_target->pdt_1f_for_no_lun = 1; |
35 | 35 | ||
36 | return 0; | 36 | return 0; |
@@ -55,7 +55,7 @@ static int slave_configure(struct scsi_device *sdev) | |||
55 | 55 | ||
56 | if (sdev->type == TYPE_DISK) | 56 | if (sdev->type == TYPE_DISK) |
57 | { | 57 | { |
58 | if (us->subclass != US_SC_SCSI && us->subclass != US_SC_CYP_ATACB) | 58 | if (us->subclass != USB_SC_SCSI && us->subclass != USB_SC_CYP_ATACB) |
59 | sdev->use_10_for_ms = 1; | 59 | sdev->use_10_for_ms = 1; |
60 | sdev->use_192_bytes_for_3f = 1; | 60 | sdev->use_192_bytes_for_3f = 1; |
61 | if (us->fflags & US_FL_NO_WP_DETECT) | 61 | if (us->fflags & US_FL_NO_WP_DETECT) |
@@ -76,7 +76,7 @@ static int slave_configure(struct scsi_device *sdev) | |||
76 | sdev->use_10_for_ms = 1; | 76 | sdev->use_10_for_ms = 1; |
77 | } | 77 | } |
78 | 78 | ||
79 | if ((us->protocol == US_PR_CB || us->protocol == US_PR_CBI) && sdev->scsi_level == SCSI_UNKNOWN) | 79 | if ((us->protocol == USB_PR_CB || us->protocol == USB_PR_CBI) && sdev->scsi_level == SCSI_UNKNOWN) |
80 | us->max_lun = 0; | 80 | us->max_lun = 0; |
81 | 81 | ||
82 | if (us->fflags & US_FL_NOT_LOCKABLE) | 82 | if (us->fflags & US_FL_NOT_LOCKABLE) |
diff --git a/drivers/staging/keucr/transport.c b/drivers/staging/keucr/transport.c index 469702176cc..fd98df643ab 100644 --- a/drivers/staging/keucr/transport.c +++ b/drivers/staging/keucr/transport.c | |||
@@ -315,7 +315,7 @@ void usb_stor_invoke_transport(struct scsi_cmnd *srb, struct us_data *us) | |||
315 | /* Determine if we need to auto-sense */ | 315 | /* Determine if we need to auto-sense */ |
316 | need_auto_sense = 0; | 316 | need_auto_sense = 0; |
317 | 317 | ||
318 | if ((us->protocol == US_PR_CB || us->protocol == US_PR_DPCM_USB) && srb->sc_data_direction != DMA_FROM_DEVICE) | 318 | if ((us->protocol == USB_PR_CB || us->protocol == USB_PR_DPCM_USB) && srb->sc_data_direction != DMA_FROM_DEVICE) |
319 | { | 319 | { |
320 | //printk("-- CB transport device requiring auto-sense\n"); | 320 | //printk("-- CB transport device requiring auto-sense\n"); |
321 | need_auto_sense = 1; | 321 | need_auto_sense = 1; |
@@ -338,7 +338,7 @@ void usb_stor_invoke_transport(struct scsi_cmnd *srb, struct us_data *us) | |||
338 | scsi_eh_prep_cmnd(srb, &ses, NULL, 0, US_SENSE_SIZE); | 338 | scsi_eh_prep_cmnd(srb, &ses, NULL, 0, US_SENSE_SIZE); |
339 | 339 | ||
340 | /* we must do the protocol translation here */ | 340 | /* we must do the protocol translation here */ |
341 | if (us->subclass == US_SC_RBC || us->subclass == US_SC_SCSI || us->subclass == US_SC_CYP_ATACB) | 341 | if (us->subclass == USB_SC_RBC || us->subclass == USB_SC_SCSI || us->subclass == USB_SC_CYP_ATACB) |
342 | srb->cmd_len = 6; | 342 | srb->cmd_len = 6; |
343 | else | 343 | else |
344 | srb->cmd_len = 12; | 344 | srb->cmd_len = 12; |
diff --git a/drivers/staging/keucr/usb.c b/drivers/staging/keucr/usb.c index 606053db069..c65b988264c 100644 --- a/drivers/staging/keucr/usb.c +++ b/drivers/staging/keucr/usb.c | |||
@@ -343,7 +343,7 @@ static int get_transport(struct us_data *us) | |||
343 | { | 343 | { |
344 | printk("usb --- get_transport\n"); | 344 | printk("usb --- get_transport\n"); |
345 | switch (us->protocol) { | 345 | switch (us->protocol) { |
346 | case US_PR_BULK: | 346 | case USB_PR_BULK: |
347 | us->transport_name = "Bulk"; | 347 | us->transport_name = "Bulk"; |
348 | us->transport = usb_stor_Bulk_transport; | 348 | us->transport = usb_stor_Bulk_transport; |
349 | us->transport_reset = usb_stor_Bulk_reset; | 349 | us->transport_reset = usb_stor_Bulk_reset; |
@@ -367,7 +367,7 @@ static int get_protocol(struct us_data *us) | |||
367 | printk("us->pusb_dev->descriptor.idVendor = %x\n", us->pusb_dev->descriptor.idVendor); | 367 | printk("us->pusb_dev->descriptor.idVendor = %x\n", us->pusb_dev->descriptor.idVendor); |
368 | printk("us->pusb_dev->descriptor.idProduct = %x\n", us->pusb_dev->descriptor.idProduct); | 368 | printk("us->pusb_dev->descriptor.idProduct = %x\n", us->pusb_dev->descriptor.idProduct); |
369 | switch (us->subclass) { | 369 | switch (us->subclass) { |
370 | case US_SC_SCSI: | 370 | case USB_SC_SCSI: |
371 | us->protocol_name = "Transparent SCSI"; | 371 | us->protocol_name = "Transparent SCSI"; |
372 | if( (us->pusb_dev->descriptor.idVendor == 0x0CF2) && (us->pusb_dev->descriptor.idProduct == 0x6250) ) | 372 | if( (us->pusb_dev->descriptor.idVendor == 0x0CF2) && (us->pusb_dev->descriptor.idProduct == 0x6250) ) |
373 | us->proto_handler = ENE_stor_invoke_transport; | 373 | us->proto_handler = ENE_stor_invoke_transport; |
@@ -418,7 +418,7 @@ static int get_pipes(struct us_data *us) | |||
418 | } | 418 | } |
419 | } | 419 | } |
420 | 420 | ||
421 | if (!ep_in || !ep_out || (us->protocol == US_PR_CBI && !ep_int)) | 421 | if (!ep_in || !ep_out || (us->protocol == USB_PR_CBI && !ep_int)) |
422 | { | 422 | { |
423 | printk("Endpoint sanity check failed! Rejecting dev.\n"); | 423 | printk("Endpoint sanity check failed! Rejecting dev.\n"); |
424 | return -EIO; | 424 | return -EIO; |
@@ -564,7 +564,7 @@ static int usb_stor_scan_thread(void * __us) | |||
564 | if (!test_bit(US_FLIDX_DONT_SCAN, &us->dflags)) | 564 | if (!test_bit(US_FLIDX_DONT_SCAN, &us->dflags)) |
565 | { | 565 | { |
566 | /* For bulk-only devices, determine the max LUN value */ | 566 | /* For bulk-only devices, determine the max LUN value */ |
567 | if (us->protocol == US_PR_BULK && !(us->fflags & US_FL_SINGLE_LUN)) | 567 | if (us->protocol == USB_PR_BULK && !(us->fflags & US_FL_SINGLE_LUN)) |
568 | { | 568 | { |
569 | mutex_lock(&us->dev_mutex); | 569 | mutex_lock(&us->dev_mutex); |
570 | us->max_lun = usb_stor_Bulk_max_lun(us); | 570 | us->max_lun = usb_stor_Bulk_max_lun(us); |