Title: [9815] trunk/drivers/usb/musb: usb: musb: tweak new adjust_channel_params helper per upstream feedback
- Revision
- 9815
- Author
- vapier
- Date
- 2011-04-01 18:27:37 -0400 (Fri, 01 Apr 2011)
Log Message
usb: musb: tweak new adjust_channel_params helper per upstream feedback
Modified Paths
Diff
Modified: trunk/drivers/usb/musb/blackfin.c (9814 => 9815)
--- trunk/drivers/usb/musb/blackfin.c 2011-04-01 22:27:05 UTC (rev 9814)
+++ trunk/drivers/usb/musb/blackfin.c 2011-04-01 22:27:37 UTC (rev 9815)
@@ -333,8 +333,8 @@
return -EIO;
}
-static int bfin_musb_channel_program(struct dma_channel *channel,
- u16 *packet_sz, u8 *mode,
+static int bfin_musb_adjust_channel_params(struct dma_channel *channel,
+ u16 packet_sz, u8 *mode,
dma_addr_t *dma_addr, u32 *len)
{
struct musb_dma_channel *musb_channel = channel->private_data;
@@ -348,7 +348,7 @@
*/
if (ANOMALY_05000450) {
if (musb_channel->transmit && *mode == 1)
- *len = *len - (*len % *packet_sz);
+ *len = *len - (*len % packet_sz);
}
return 0;
@@ -453,7 +453,7 @@
.vbus_status = bfin_musb_vbus_status,
.set_vbus = bfin_musb_set_vbus,
- .channel_program = bfin_musb_channel_program,
+ .adjust_channel_params = bfin_musb_adjust_channel_params,
};
static u64 bfin_dmamask = DMA_BIT_MASK(32);
Modified: trunk/drivers/usb/musb/musb_core.h (9814 => 9815)
--- trunk/drivers/usb/musb/musb_core.h 2011-04-01 22:27:05 UTC (rev 9814)
+++ trunk/drivers/usb/musb/musb_core.h 2011-04-01 22:27:37 UTC (rev 9815)
@@ -276,8 +276,8 @@
int (*vbus_status)(struct musb *musb);
void (*set_vbus)(struct musb *musb, int on);
- int (*channel_program)(struct dma_channel *channel,
- u16 *packet_sz, u8 *mode,
+ int (*adjust_channel_params)(struct dma_channel *channel,
+ u16 packet_sz, u8 *mode,
dma_addr_t *dma_addr, u32 *len);
};
Modified: trunk/drivers/usb/musb/musbhsdma.c (9814 => 9815)
--- trunk/drivers/usb/musb/musbhsdma.c 2011-04-01 22:27:05 UTC (rev 9814)
+++ trunk/drivers/usb/musb/musbhsdma.c 2011-04-01 22:27:37 UTC (rev 9815)
@@ -170,9 +170,9 @@
channel->status == MUSB_DMA_STATUS_BUSY);
/* Let targets check/tweak the arguments */
- if (musb->ops->channel_program) {
- int ret = musb->ops->channel_program(channel, &packet_sz,
- &mode, &dma_addr, &len);
+ if (musb->ops->adjust_channel_params) {
+ int ret = musb->ops->adjust_channel_params(channel,
+ packet_sz, &mode, &dma_addr, &len);
if (ret)
return ret;
}
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
