From d2cf1e60b4b869da2116215f05f49fa084c595f0 Mon Sep 17 00:00:00 2001 From: Wojciech Zajac Date: Mon, 23 Jun 2014 11:06:20 +0200 Subject: [PATCH] Removed unused transfer flags for usb_storage --- drivers/usb_storage/urb_helper.c | 3 +-- drivers/usb_storage/urb_helper.h | 2 +- drivers/usb_storage/usb_storage.c | 12 ++++++------ 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/usb_storage/urb_helper.c b/drivers/usb_storage/urb_helper.c index 7302848fa..0756087e3 100755 --- a/drivers/usb_storage/urb_helper.c +++ b/drivers/usb_storage/urb_helper.c @@ -20,7 +20,7 @@ void init_urb(struct ddekit_usb_urb * urb, struct ddekit_usb_dev * dev, ddekit_int32_t urb_type, ddekit_int32_t urb_endpoint, - ddekit_int32_t urb_direction, ddekit_uint32_t urb_transfer_flags) + ddekit_int32_t urb_direction) { MASS_DEBUG_DUMP; @@ -43,7 +43,6 @@ init_urb(struct ddekit_usb_urb * urb, struct ddekit_usb_dev * dev, urb->type = urb_type; urb->endpoint = urb_endpoint; urb->direction = urb_direction; - urb->transfer_flags = urb_transfer_flags; } diff --git a/drivers/usb_storage/urb_helper.h b/drivers/usb_storage/urb_helper.h index 5046edb65..59680526f 100755 --- a/drivers/usb_storage/urb_helper.h +++ b/drivers/usb_storage/urb_helper.h @@ -23,7 +23,7 @@ * declared functions * *---------------------------*/ void init_urb(struct ddekit_usb_urb *, struct ddekit_usb_dev *, ddekit_int32_t, - ddekit_int32_t, ddekit_int32_t, ddekit_uint32_t); + ddekit_int32_t, ddekit_int32_t); void attach_urb_data(struct ddekit_usb_urb *, int, void *, ddekit_uint32_t); int blocking_urb_submit(struct ddekit_usb_urb *, ddekit_sem_t *, int); diff --git a/drivers/usb_storage/usb_storage.c b/drivers/usb_storage/usb_storage.c index d4d4589f8..0297082de 100755 --- a/drivers/usb_storage/usb_storage.c +++ b/drivers/usb_storage/usb_storage.c @@ -221,7 +221,7 @@ mass_storage_send_scsi_cbw_out(int scsi_cmd, scsi_transfer * info) /* Reset URB and assign given values */ init_urb(&urb, driver_state.cur_periph->dev, DDEKIT_USB_TRANSFER_BLK, - driver_state.cur_periph->ep_out, DDEKIT_USB_OUT, 0); + driver_state.cur_periph->ep_out, DDEKIT_USB_OUT); /* Reset CBW and assign default values */ init_cbw(&cbw, last_cbw_tag = current_cbw_tag++); @@ -254,7 +254,7 @@ mass_storage_send_scsi_data_in(void * buf, unsigned int in_len) /* Reset URB and assign given values */ init_urb(&urb, driver_state.cur_periph->dev, DDEKIT_USB_TRANSFER_BLK, - driver_state.cur_periph->ep_in, DDEKIT_USB_IN, 0); + driver_state.cur_periph->ep_in, DDEKIT_USB_IN); /* Attach buffer to URB */ attach_urb_data(&urb, URB_BUF_TYPE_DATA, buf, in_len); @@ -280,7 +280,7 @@ mass_storage_send_scsi_data_out(void * buf, unsigned int out_len) /* Reset URB and assign given values */ init_urb(&urb, driver_state.cur_periph->dev, DDEKIT_USB_TRANSFER_BLK, - driver_state.cur_periph->ep_out, DDEKIT_USB_OUT, 0); + driver_state.cur_periph->ep_out, DDEKIT_USB_OUT); /* Attach buffer to URB */ attach_urb_data(&urb, URB_BUF_TYPE_DATA, buf, out_len); @@ -309,7 +309,7 @@ mass_storage_send_scsi_csw_in(void) /* Reset URB and assign given values */ init_urb(&urb, driver_state.cur_periph->dev, DDEKIT_USB_TRANSFER_BLK, - driver_state.cur_periph->ep_in, DDEKIT_USB_IN, 0); + driver_state.cur_periph->ep_in, DDEKIT_USB_IN); /* Clear CSW for receiving */ init_csw(&csw); @@ -344,7 +344,7 @@ mass_storage_send_bulk_reset(void) /* Reset URB and assign given values */ init_urb(&urb, driver_state.cur_periph->dev, DDEKIT_USB_TRANSFER_CTL, 0, - DDEKIT_USB_OUT, 0); + DDEKIT_USB_OUT); /* Clear setup data */ memset(&bulk_setup, 0, sizeof(bulk_setup)); @@ -1325,7 +1325,7 @@ mass_storage_get_endpoints(int * ep_in, int * ep_out) /* Reset URB and assign given values */ init_urb(&urb, driver_state.cur_periph->dev, DDEKIT_USB_TRANSFER_CTL, 0, - DDEKIT_USB_IN, 0); + DDEKIT_USB_IN); /* Clear setup data */ memset(&setup_buf, 0, sizeof(setup_buf));