diff options
author | Pete Zaitcev <zaitcev@redhat.com> | 2007-10-23 21:57:25 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-02-01 17:34:47 -0500 |
commit | eedffd12e07d8fd150618d603d010b491dc90354 (patch) | |
tree | d0a14f642db6719d47b24d24e06bc4a168d02c63 | |
parent | 5a3201b2809a9f7bcda8413c445483f5b5e490a3 (diff) |
USB: Remove unnecessary zeroing from ub
These zeroings were taken from usb-storage long time ago. I examined
the submission paths and usb_fill_bulk_urb and found them unnecessary.
Signed-off-by: Pete Zaitcev <zaitcev@yahoo.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/block/ub.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/drivers/block/ub.c b/drivers/block/ub.c index c6179d6ac6e4..a70c1c29a7aa 100644 --- a/drivers/block/ub.c +++ b/drivers/block/ub.c | |||
@@ -922,11 +922,6 @@ static int ub_scsi_cmd_start(struct ub_dev *sc, struct ub_scsi_cmd *cmd) | |||
922 | usb_fill_bulk_urb(&sc->work_urb, sc->dev, sc->send_bulk_pipe, | 922 | usb_fill_bulk_urb(&sc->work_urb, sc->dev, sc->send_bulk_pipe, |
923 | bcb, US_BULK_CB_WRAP_LEN, ub_urb_complete, sc); | 923 | bcb, US_BULK_CB_WRAP_LEN, ub_urb_complete, sc); |
924 | 924 | ||
925 | /* Fill what we shouldn't be filling, because usb-storage did so. */ | ||
926 | sc->work_urb.actual_length = 0; | ||
927 | sc->work_urb.error_count = 0; | ||
928 | sc->work_urb.status = 0; | ||
929 | |||
930 | if ((rc = usb_submit_urb(&sc->work_urb, GFP_ATOMIC)) != 0) { | 925 | if ((rc = usb_submit_urb(&sc->work_urb, GFP_ATOMIC)) != 0) { |
931 | /* XXX Clear stalls */ | 926 | /* XXX Clear stalls */ |
932 | ub_complete(&sc->work_done); | 927 | ub_complete(&sc->work_done); |
@@ -1313,9 +1308,6 @@ static void ub_data_start(struct ub_dev *sc, struct ub_scsi_cmd *cmd) | |||
1313 | sc->last_pipe = pipe; | 1308 | sc->last_pipe = pipe; |
1314 | usb_fill_bulk_urb(&sc->work_urb, sc->dev, pipe, sg_virt(sg), | 1309 | usb_fill_bulk_urb(&sc->work_urb, sc->dev, pipe, sg_virt(sg), |
1315 | sg->length, ub_urb_complete, sc); | 1310 | sg->length, ub_urb_complete, sc); |
1316 | sc->work_urb.actual_length = 0; | ||
1317 | sc->work_urb.error_count = 0; | ||
1318 | sc->work_urb.status = 0; | ||
1319 | 1311 | ||
1320 | if ((rc = usb_submit_urb(&sc->work_urb, GFP_ATOMIC)) != 0) { | 1312 | if ((rc = usb_submit_urb(&sc->work_urb, GFP_ATOMIC)) != 0) { |
1321 | /* XXX Clear stalls */ | 1313 | /* XXX Clear stalls */ |
@@ -1356,9 +1348,6 @@ static int __ub_state_stat(struct ub_dev *sc, struct ub_scsi_cmd *cmd) | |||
1356 | sc->last_pipe = sc->recv_bulk_pipe; | 1348 | sc->last_pipe = sc->recv_bulk_pipe; |
1357 | usb_fill_bulk_urb(&sc->work_urb, sc->dev, sc->recv_bulk_pipe, | 1349 | usb_fill_bulk_urb(&sc->work_urb, sc->dev, sc->recv_bulk_pipe, |
1358 | &sc->work_bcs, US_BULK_CS_WRAP_LEN, ub_urb_complete, sc); | 1350 | &sc->work_bcs, US_BULK_CS_WRAP_LEN, ub_urb_complete, sc); |
1359 | sc->work_urb.actual_length = 0; | ||
1360 | sc->work_urb.error_count = 0; | ||
1361 | sc->work_urb.status = 0; | ||
1362 | 1351 | ||
1363 | if ((rc = usb_submit_urb(&sc->work_urb, GFP_ATOMIC)) != 0) { | 1352 | if ((rc = usb_submit_urb(&sc->work_urb, GFP_ATOMIC)) != 0) { |
1364 | /* XXX Clear stalls */ | 1353 | /* XXX Clear stalls */ |
@@ -1473,9 +1462,6 @@ static int ub_submit_clear_stall(struct ub_dev *sc, struct ub_scsi_cmd *cmd, | |||
1473 | 1462 | ||
1474 | usb_fill_control_urb(&sc->work_urb, sc->dev, sc->send_ctrl_pipe, | 1463 | usb_fill_control_urb(&sc->work_urb, sc->dev, sc->send_ctrl_pipe, |
1475 | (unsigned char*) cr, NULL, 0, ub_urb_complete, sc); | 1464 | (unsigned char*) cr, NULL, 0, ub_urb_complete, sc); |
1476 | sc->work_urb.actual_length = 0; | ||
1477 | sc->work_urb.error_count = 0; | ||
1478 | sc->work_urb.status = 0; | ||
1479 | 1465 | ||
1480 | if ((rc = usb_submit_urb(&sc->work_urb, GFP_ATOMIC)) != 0) { | 1466 | if ((rc = usb_submit_urb(&sc->work_urb, GFP_ATOMIC)) != 0) { |
1481 | ub_complete(&sc->work_done); | 1467 | ub_complete(&sc->work_done); |
@@ -1953,9 +1939,6 @@ static int ub_sync_reset(struct ub_dev *sc) | |||
1953 | 1939 | ||
1954 | usb_fill_control_urb(&sc->work_urb, sc->dev, sc->send_ctrl_pipe, | 1940 | usb_fill_control_urb(&sc->work_urb, sc->dev, sc->send_ctrl_pipe, |
1955 | (unsigned char*) cr, NULL, 0, ub_probe_urb_complete, &compl); | 1941 | (unsigned char*) cr, NULL, 0, ub_probe_urb_complete, &compl); |
1956 | sc->work_urb.actual_length = 0; | ||
1957 | sc->work_urb.error_count = 0; | ||
1958 | sc->work_urb.status = 0; | ||
1959 | 1942 | ||
1960 | if ((rc = usb_submit_urb(&sc->work_urb, GFP_KERNEL)) != 0) { | 1943 | if ((rc = usb_submit_urb(&sc->work_urb, GFP_KERNEL)) != 0) { |
1961 | printk(KERN_WARNING | 1944 | printk(KERN_WARNING |
@@ -2007,9 +1990,6 @@ static int ub_sync_getmaxlun(struct ub_dev *sc) | |||
2007 | 1990 | ||
2008 | usb_fill_control_urb(&sc->work_urb, sc->dev, sc->recv_ctrl_pipe, | 1991 | usb_fill_control_urb(&sc->work_urb, sc->dev, sc->recv_ctrl_pipe, |
2009 | (unsigned char*) cr, p, 1, ub_probe_urb_complete, &compl); | 1992 | (unsigned char*) cr, p, 1, ub_probe_urb_complete, &compl); |
2010 | sc->work_urb.actual_length = 0; | ||
2011 | sc->work_urb.error_count = 0; | ||
2012 | sc->work_urb.status = 0; | ||
2013 | 1993 | ||
2014 | if ((rc = usb_submit_urb(&sc->work_urb, GFP_KERNEL)) != 0) | 1994 | if ((rc = usb_submit_urb(&sc->work_urb, GFP_KERNEL)) != 0) |
2015 | goto err_submit; | 1995 | goto err_submit; |
@@ -2077,9 +2057,6 @@ static int ub_probe_clear_stall(struct ub_dev *sc, int stalled_pipe) | |||
2077 | 2057 | ||
2078 | usb_fill_control_urb(&sc->work_urb, sc->dev, sc->send_ctrl_pipe, | 2058 | usb_fill_control_urb(&sc->work_urb, sc->dev, sc->send_ctrl_pipe, |
2079 | (unsigned char*) cr, NULL, 0, ub_probe_urb_complete, &compl); | 2059 | (unsigned char*) cr, NULL, 0, ub_probe_urb_complete, &compl); |
2080 | sc->work_urb.actual_length = 0; | ||
2081 | sc->work_urb.error_count = 0; | ||
2082 | sc->work_urb.status = 0; | ||
2083 | 2060 | ||
2084 | if ((rc = usb_submit_urb(&sc->work_urb, GFP_KERNEL)) != 0) { | 2061 | if ((rc = usb_submit_urb(&sc->work_urb, GFP_KERNEL)) != 0) { |
2085 | printk(KERN_WARNING | 2062 | printk(KERN_WARNING |