summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBin Liu <b-liu@ti.com>2018-05-21 09:42:11 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-05-22 06:03:24 -0400
commit53e1657a1c94b96a63b8d443c3aeec0c650621e3 (patch)
treefe0abcb0b18afb1f8b848d04590efccb1ff43b9c
parent42e990ea80f23c58404f24c009da3ae3867a1fec (diff)
usb: musb: remove adjust_channel_params() callback from musb_platform_ops
Now Blackfin support is removed, nobody uses adjust_channel_params() any more, so remove it from struct musb_platform_ops. Signed-off-by: Bin Liu <b-liu@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/musb/musb_core.h4
-rw-r--r--drivers/usb/musb/musbhsdma.c8
2 files changed, 0 insertions, 12 deletions
diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h
index a4bf1e9e2d2c..f57323e50e44 100644
--- a/drivers/usb/musb/musb_core.h
+++ b/drivers/usb/musb/musb_core.h
@@ -138,7 +138,6 @@ struct musb_io;
138 * @recover: platform-specific babble recovery 138 * @recover: platform-specific babble recovery
139 * @vbus_status: returns vbus status if possible 139 * @vbus_status: returns vbus status if possible
140 * @set_vbus: forces vbus status 140 * @set_vbus: forces vbus status
141 * @adjust_channel_params: pre check for standard dma channel_program func
142 * @pre_root_reset_end: called before the root usb port reset flag gets cleared 141 * @pre_root_reset_end: called before the root usb port reset flag gets cleared
143 * @post_root_reset_end: called after the root usb port reset flag gets cleared 142 * @post_root_reset_end: called after the root usb port reset flag gets cleared
144 * @phy_callback: optional callback function for the phy to call 143 * @phy_callback: optional callback function for the phy to call
@@ -184,9 +183,6 @@ struct musb_platform_ops {
184 int (*vbus_status)(struct musb *musb); 183 int (*vbus_status)(struct musb *musb);
185 void (*set_vbus)(struct musb *musb, int on); 184 void (*set_vbus)(struct musb *musb, int on);
186 185
187 int (*adjust_channel_params)(struct dma_channel *channel,
188 u16 packet_sz, u8 *mode,
189 dma_addr_t *dma_addr, u32 *len);
190 void (*pre_root_reset_end)(struct musb *musb); 186 void (*pre_root_reset_end)(struct musb *musb);
191 void (*post_root_reset_end)(struct musb *musb); 187 void (*post_root_reset_end)(struct musb *musb);
192 int (*phy_callback)(enum musb_vbus_id_status status); 188 int (*phy_callback)(enum musb_vbus_id_status status);
diff --git a/drivers/usb/musb/musbhsdma.c b/drivers/usb/musb/musbhsdma.c
index 57d416a110a5..a688f7f87829 100644
--- a/drivers/usb/musb/musbhsdma.c
+++ b/drivers/usb/musb/musbhsdma.c
@@ -199,14 +199,6 @@ static int dma_channel_program(struct dma_channel *channel,
199 BUG_ON(channel->status == MUSB_DMA_STATUS_UNKNOWN || 199 BUG_ON(channel->status == MUSB_DMA_STATUS_UNKNOWN ||
200 channel->status == MUSB_DMA_STATUS_BUSY); 200 channel->status == MUSB_DMA_STATUS_BUSY);
201 201
202 /* Let targets check/tweak the arguments */
203 if (musb->ops->adjust_channel_params) {
204 int ret = musb->ops->adjust_channel_params(channel,
205 packet_sz, &mode, &dma_addr, &len);
206 if (ret)
207 return ret;
208 }
209
210 /* 202 /*
211 * The DMA engine in RTL1.8 and above cannot handle 203 * The DMA engine in RTL1.8 and above cannot handle
212 * DMA addresses that are not aligned to a 4 byte boundary. 204 * DMA addresses that are not aligned to a 4 byte boundary.