lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

usb/isp1760: Remove redundant "data_buffer" member from struct inter_packet_info

Browse Source 
Signed-off-by: Arvid Brodin <arvid.brodin@enea.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Arvid Brodin
2011-02-26 22:05:26 +01:00
committed by Greg Kroah-Hartman
parent a041d8e437
commit bbaa387674
2 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/usb/host/isp1760-hcd.c
View File

@@ -837,7 +837,6 @@ static void enqueue_one_atl_qtd(struct isp1760_hcd *priv,
priv->atl_ints[slot].qh = qh; priv->atl_ints[slot].qh = qh;
priv->atl_ints[slot].qtd = qtd; priv->atl_ints[slot].qtd = qtd;
priv->atl_ints[slot].data_buffer = qtd->data_buffer;
qtd->status |= URB_ENQUEUED; qtd->status |= URB_ENQUEUED;
qtd->status |= slot << 16; qtd->status |= slot << 16;
} }
@@ -856,7 +855,6 @@ static void enqueue_one_int_qtd(struct isp1760_hcd *priv,
priv->int_ints[slot].qh = qh; priv->int_ints[slot].qh = qh;
priv->int_ints[slot].qtd = qtd; priv->int_ints[slot].qtd = qtd;
priv->int_ints[slot].data_buffer = qtd->data_buffer;
qtd->status |= URB_ENQUEUED; qtd->status |= URB_ENQUEUED;
qtd->status |= slot << 16; qtd->status |= slot << 16;
} }
@@ -1147,8 +1145,7 @@ static void do_atl_int(struct usb_hcd *hcd)
switch (DW1_GET_PID(ptd.dw1)) { switch (DW1_GET_PID(ptd.dw1)) {
case IN_PID: case IN_PID:
mem_reads8(hcd->regs, qtd->payload_addr, mem_reads8(hcd->regs, qtd->payload_addr,
priv->atl_ints[queue_entry].data_buffer, qtd->data_buffer, length);
length);
case OUT_PID: case OUT_PID:
@@ -1159,7 +1156,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].qtd = NULL;
priv->atl_ints[queue_entry].qh = NULL; priv->atl_ints[queue_entry].qh = NULL;
@@ -1283,8 +1279,7 @@ static void do_intl_int(struct usb_hcd *hcd)
switch (DW1_GET_PID(ptd.dw1)) { switch (DW1_GET_PID(ptd.dw1)) {
case IN_PID: case IN_PID:
mem_reads8(hcd->regs, qtd->payload_addr, mem_reads8(hcd->regs, qtd->payload_addr,
priv->int_ints[queue_entry].data_buffer, qtd->data_buffer, length);
length);
case OUT_PID: case OUT_PID:
urb->actual_length += length; urb->actual_length += length;
@@ -1294,7 +1289,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].qtd = NULL;
priv->int_ints[queue_entry].qh = NULL; priv->int_ints[queue_entry].qh = NULL;
@@ -1700,7 +1694,6 @@ static int isp1760_urb_dequeue(struct usb_hcd *hcd, struct urb *urb,
ints->qh = NULL; ints->qh = NULL;
ints->qtd = NULL; ints->qtd = NULL;
ints->data_buffer = NULL;
isp1760_urb_done(priv, urb, status); isp1760_urb_done(priv, urb, status);
if (qtd) if (qtd)

1
drivers/usb/host/isp1760-hcd.h
View File

@@ -107,7 +107,6 @@ struct ptd {
#define PAYLOAD_OFFSET 0x1000 #define PAYLOAD_OFFSET 0x1000
struct inter_packet_info { struct inter_packet_info {
void *data_buffer;
#define PTD_FIRE_NEXT (1 << 0) #define PTD_FIRE_NEXT (1 << 0)
#define PTD_URB_FINISHED (1 << 1) #define PTD_URB_FINISHED (1 << 1)
struct isp1760_qh *qh; struct isp1760_qh *qh;