Commit 53e1657a authored by Bin Liu's avatar Bin Liu Committed by Greg Kroah-Hartman
Browse files

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: default avatarBin Liu <b-liu@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 42e990ea
Loading
Loading
Loading
Loading
+0 −4
Original line number Original line Diff line number Diff line
@@ -138,7 +138,6 @@ struct musb_io;
 * @recover:	platform-specific babble recovery
 * @recover:	platform-specific babble recovery
 * @vbus_status: returns vbus status if possible
 * @vbus_status: returns vbus status if possible
 * @set_vbus:	forces vbus status
 * @set_vbus:	forces vbus status
 * @adjust_channel_params: pre check for standard dma channel_program func
 * @pre_root_reset_end: called before the root usb port reset flag gets cleared
 * @pre_root_reset_end: called before the root usb port reset flag gets cleared
 * @post_root_reset_end: called after the root usb port reset flag gets cleared
 * @post_root_reset_end: called after the root usb port reset flag gets cleared
 * @phy_callback: optional callback function for the phy to call
 * @phy_callback: optional callback function for the phy to call
@@ -184,9 +183,6 @@ struct musb_platform_ops {
	int	(*vbus_status)(struct musb *musb);
	int	(*vbus_status)(struct musb *musb);
	void	(*set_vbus)(struct musb *musb, int on);
	void	(*set_vbus)(struct musb *musb, int on);


	int	(*adjust_channel_params)(struct dma_channel *channel,
				u16 packet_sz, u8 *mode,
				dma_addr_t *dma_addr, u32 *len);
	void	(*pre_root_reset_end)(struct musb *musb);
	void	(*pre_root_reset_end)(struct musb *musb);
	void	(*post_root_reset_end)(struct musb *musb);
	void	(*post_root_reset_end)(struct musb *musb);
	int	(*phy_callback)(enum musb_vbus_id_status status);
	int	(*phy_callback)(enum musb_vbus_id_status status);
+0 −8
Original line number Original line Diff line number Diff line
@@ -199,14 +199,6 @@ static int dma_channel_program(struct dma_channel *channel,
	BUG_ON(channel->status == MUSB_DMA_STATUS_UNKNOWN ||
	BUG_ON(channel->status == MUSB_DMA_STATUS_UNKNOWN ||
		channel->status == MUSB_DMA_STATUS_BUSY);
		channel->status == MUSB_DMA_STATUS_BUSY);


	/* Let targets check/tweak the arguments */
	if (musb->ops->adjust_channel_params) {
		int ret = musb->ops->adjust_channel_params(channel,
			packet_sz, &mode, &dma_addr, &len);
		if (ret)
			return ret;
	}

	/*
	/*
	 * The DMA engine in RTL1.8 and above cannot handle
	 * The DMA engine in RTL1.8 and above cannot handle
	 * DMA addresses that are not aligned to a 4 byte boundary.
	 * DMA addresses that are not aligned to a 4 byte boundary.