Signed-off-by: Arvid Brodin <arvid.brodin@xxxxxxxx>
---
drivers/usb/host/isp1760-hcd.c | 11 ++---------
drivers/usb/host/isp1760-hcd.h | 1 -
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/drivers/usb/host/isp1760-hcd.c b/drivers/usb/host/isp1760-hcd.c
index 7bb551c..5dd4197 100644
--- a/drivers/usb/host/isp1760-hcd.c
+++ b/drivers/usb/host/isp1760-hcd.c
@@ -824,7 +824,6 @@ static void enqueue_one_atl_qtd(struct isp1760_hcd *priv, struct isp1760_qh *qh,
priv->atl_ints[slot].qh = qh;
priv->atl_ints[slot].qtd = qtd;
- priv->atl_ints[slot].data_buffer = qtd->data_buffer;
qtd->status |= URB_ENQUEUED;
qtd->status |= slot << 16;
}
@@ -842,7 +841,6 @@ static void enqueue_one_int_qtd(struct isp1760_hcd *priv, struct isp1760_qh *qh,
priv->int_ints[slot].qh = qh;
priv->int_ints[slot].qtd = qtd;
- priv->int_ints[slot].data_buffer = qtd->data_buffer;
qtd->status |= URB_ENQUEUED;
qtd->status |= slot << 16;
}
@@ -1134,8 +1132,7 @@ static void do_atl_int(struct usb_hcd *hcd)
switch (DW1_GET_PID(ptd.dw1)) {
case IN_PID:
isp176x_mem_reads8(hcd->regs, qtd->payload_addr,
- priv->atl_ints[queue_entry].data_buffer,
- length);
+ qtd->data_buffer, length);
case OUT_PID:
@@ -1146,7 +1143,6 @@ static void do_atl_int(struct usb_hcd *hcd)
}
}
- priv->atl_ints[queue_entry].data_buffer = NULL;
priv->atl_ints[queue_entry].qtd = NULL;
priv->atl_ints[queue_entry].qh = NULL;
@@ -1272,8 +1268,7 @@ static void do_intl_int(struct usb_hcd *hcd)
switch (DW1_GET_PID(ptd.dw1)) {
case IN_PID:
isp176x_mem_reads8(hcd->regs, qtd->payload_addr,
- priv->int_ints[queue_entry].data_buffer,
- length);
+ qtd->data_buffer, length);
case OUT_PID:
urb->actual_length += length;
@@ -1283,7 +1278,6 @@ static void do_intl_int(struct usb_hcd *hcd)
}
}
- priv->int_ints[queue_entry].data_buffer = NULL;
priv->int_ints[queue_entry].qtd = NULL;
priv->int_ints[queue_entry].qh = NULL;
@@ -1690,7 +1684,6 @@ static int isp1760_urb_dequeue(struct usb_hcd *hcd, struct urb *urb,
ints->qh = NULL;
ints->qtd = NULL;
- ints->data_buffer = NULL;
isp1760_urb_done(priv, urb, status);
if (qtd)
diff --git a/drivers/usb/host/isp1760-hcd.h b/drivers/usb/host/isp1760-hcd.h
index 587adba..aadd77b 100644
--- a/drivers/usb/host/isp1760-hcd.h
+++ b/drivers/usb/host/isp1760-hcd.h
@@ -107,7 +107,6 @@ struct ptd {
#define PAYLOAD_OFFSET 0x1000
struct inter_packet_info {
- void *data_buffer;
#define PTD_FIRE_NEXT (1 << 0)
#define PTD_URB_FINISHED (1 << 1)
struct isp1760_qh *qh;
--
1.6.3.3
--
Arvid Brodin
Enea Services Stockholm AB
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
