This patch series is meant to clean up the code (removing more of the legacy from the original and quite frankly horrible Philips drivers), and also contain some small bug fixes.
* Patch 4: Removes redundant "data_buffer" member from struct inter_packet_info.
drivers/usb/host/isp1760-hcd.c | 11 ++---------
drivers/usb/host/isp1760-hcd.h | 1 -
2 files changed, 2 insertions(+), 10 deletions(-)
diff -Nurp linux-2.6.37-isp1760-003/drivers/usb/host/isp1760-hcd.c linux-2.6.37-isp1760-004/drivers/usb/host/isp1760-hcd.c
--- linux-2.6.37-isp1760-003/drivers/usb/host/isp1760-hcd.c 2011-02-23 13:12:45.541094959 +0100
+++ linux-2.6.37-isp1760-004/drivers/usb/host/isp1760-hcd.c 2011-02-23 13:15:03.477095910 +0100
@@ -823,7 +823,6 @@ static void enqueue_one_atl_qtd(struct i
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;
}
@@ -841,7 +840,6 @@ static void enqueue_one_int_qtd(struct i
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;
}
@@ -1126,8 +1124,7 @@ static void do_atl_int(struct usb_hcd *h
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:
@@ -1138,7 +1135,6 @@ static void do_atl_int(struct usb_hcd *h
}
}
- priv->atl_ints[queue_entry].data_buffer = NULL;
priv->atl_ints[queue_entry].qtd = NULL;
priv->atl_ints[queue_entry].qh = NULL;
@@ -1261,8 +1257,7 @@ static void do_intl_int(struct usb_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;
@@ -1272,7 +1267,6 @@ static void do_intl_int(struct usb_hcd *
}
}
- priv->int_ints[queue_entry].data_buffer = NULL;
priv->int_ints[queue_entry].qtd = NULL;
priv->int_ints[queue_entry].qh = NULL;
@@ -1679,7 +1673,6 @@ static int isp1760_urb_dequeue(struct us
ints->qh = NULL;
ints->qtd = NULL;
- ints->data_buffer = NULL;
isp1760_urb_done(priv, urb, status);
if (qtd)
diff -Nurp linux-2.6.37-isp1760-003/drivers/usb/host/isp1760-hcd.h linux-2.6.37-isp1760-004/drivers/usb/host/isp1760-hcd.h
--- linux-2.6.37-isp1760-003/drivers/usb/host/isp1760-hcd.h 2011-02-23 13:10:41.325095880 +0100
+++ linux-2.6.37-isp1760-004/drivers/usb/host/isp1760-hcd.h 2011-02-23 13:15:03.477095910 +0100
@@ -106,7 +106,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;
Signed-off-by: Arvid Brodin <arvid.brodin@xxxxxxxx>
--
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
