aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/host/isp1760-hcd.c
diff options
context:
space:
mode:
authorArvid Brodin <arvid.brodin@enea.com>2011-02-26 16:05:26 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2011-02-28 22:23:37 -0500
commitbbaa387674b65a2f784631cc4c87c77ec9d3374e (patch)
tree545540742b6c8928acadadec905309924dbe58cf /drivers/usb/host/isp1760-hcd.c
parenta041d8e4375ee6d78409a721221878dcad5eff8a (diff)
usb/isp1760: Remove redundant "data_buffer" member from struct inter_packet_info
Signed-off-by: Arvid Brodin <arvid.brodin@enea.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/host/isp1760-hcd.c')
-rw-r--r--drivers/usb/host/isp1760-hcd.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/usb/host/isp1760-hcd.c b/drivers/usb/host/isp1760-hcd.c
index cfb8e8ab9338..e0d9704b2039 100644
--- a/drivers/usb/host/isp1760-hcd.c
+++ b/drivers/usb/host/isp1760-hcd.c
@@ -837,7 +837,6 @@ static void enqueue_one_atl_qtd(struct isp1760_hcd *priv,
837 837
838 priv->atl_ints[slot].qh = qh; 838 priv->atl_ints[slot].qh = qh;
839 priv->atl_ints[slot].qtd = qtd; 839 priv->atl_ints[slot].qtd = qtd;
840 priv->atl_ints[slot].data_buffer = qtd->data_buffer;
841 qtd->status |= URB_ENQUEUED; 840 qtd->status |= URB_ENQUEUED;
842 qtd->status |= slot << 16; 841 qtd->status |= slot << 16;
843} 842}
@@ -856,7 +855,6 @@ static void enqueue_one_int_qtd(struct isp1760_hcd *priv,
856 855
857 priv->int_ints[slot].qh = qh; 856 priv->int_ints[slot].qh = qh;
858 priv->int_ints[slot].qtd = qtd; 857 priv->int_ints[slot].qtd = qtd;
859 priv->int_ints[slot].data_buffer = qtd->data_buffer;
860 qtd->status |= URB_ENQUEUED; 858 qtd->status |= URB_ENQUEUED;
861 qtd->status |= slot << 16; 859 qtd->status |= slot << 16;
862} 860}
@@ -1147,8 +1145,7 @@ static void do_atl_int(struct usb_hcd *hcd)
1147 switch (DW1_GET_PID(ptd.dw1)) { 1145 switch (DW1_GET_PID(ptd.dw1)) {
1148 case IN_PID: 1146 case IN_PID:
1149 mem_reads8(hcd->regs, qtd->payload_addr, 1147 mem_reads8(hcd->regs, qtd->payload_addr,
1150 priv->atl_ints[queue_entry].data_buffer, 1148 qtd->data_buffer, length);
1151 length);
1152 1149
1153 case OUT_PID: 1150 case OUT_PID:
1154 1151
@@ -1159,7 +1156,6 @@ static void do_atl_int(struct usb_hcd *hcd)
1159 } 1156 }
1160 } 1157 }
1161 1158
1162 priv->atl_ints[queue_entry].data_buffer = NULL;
1163 priv->atl_ints[queue_entry].qtd = NULL; 1159 priv->atl_ints[queue_entry].qtd = NULL;
1164 priv->atl_ints[queue_entry].qh = NULL; 1160 priv->atl_ints[queue_entry].qh = NULL;
1165 1161
@@ -1283,8 +1279,7 @@ static void do_intl_int(struct usb_hcd *hcd)
1283 switch (DW1_GET_PID(ptd.dw1)) { 1279 switch (DW1_GET_PID(ptd.dw1)) {
1284 case IN_PID: 1280 case IN_PID:
1285 mem_reads8(hcd->regs, qtd->payload_addr, 1281 mem_reads8(hcd->regs, qtd->payload_addr,
1286 priv->int_ints[queue_entry].data_buffer, 1282 qtd->data_buffer, length);
1287 length);
1288 case OUT_PID: 1283 case OUT_PID:
1289 1284
1290 urb->actual_length += length; 1285 urb->actual_length += length;
@@ -1294,7 +1289,6 @@ static void do_intl_int(struct usb_hcd *hcd)
1294 } 1289 }
1295 } 1290 }
1296 1291
1297 priv->int_ints[queue_entry].data_buffer = NULL;
1298 priv->int_ints[queue_entry].qtd = NULL; 1292 priv->int_ints[queue_entry].qtd = NULL;
1299 priv->int_ints[queue_entry].qh = NULL; 1293 priv->int_ints[queue_entry].qh = NULL;
1300 1294
@@ -1700,7 +1694,6 @@ static int isp1760_urb_dequeue(struct usb_hcd *hcd, struct urb *urb,
1700 1694
1701 ints->qh = NULL; 1695 ints->qh = NULL;
1702 ints->qtd = NULL; 1696 ints->qtd = NULL;
1703 ints->data_buffer = NULL;
1704 1697
1705 isp1760_urb_done(priv, urb, status); 1698 isp1760_urb_done(priv, urb, status);
1706 if (qtd) 1699 if (qtd)