Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b28a6432 authored by Felipe Balbi's avatar Felipe Balbi
Browse files

usb: musb: rename ->reset() to ->recover() 



recover is a much better name than reset, considering
we don't really reset the IP, just run platform-specific
babble recovery algorithm.

while at that, also fix a typo in comment and add kdoc
for recover memeber of platform_ops.

Tested-by: default avatarBin Liu <b-liu@ti.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent b4dc38fd

drivers/usb/musb/musb_core.c

+1 −1
Original line number Diff line number Diff line
@@ -1838,7 +1838,7 @@ static void musb_recover_work(struct work_struct *data) 
	int ret;

	u8 devctl;



	ret  = musb_platform_reset(musb);

	ret  = musb_platform_recover(musb);

	if (ret) {

		musb_enable_interrupts(musb);

		return;

drivers/usb/musb/musb_core.h

+7 −6
Original line number Diff line number Diff line
@@ -160,7 +160,8 @@ struct musb_io; 
 * @init:	turns on clocks, sets up platform-specific registers, etc

 * @exit:	undoes @init

 * @set_mode:	forcefully changes operating mode

 * @try_ilde:	tries to idle the IP

 * @try_idle:	tries to idle the IP

 * @recover:	platform-specific babble recovery

 * @vbus_status: returns vbus status if possible

 * @set_vbus:	forces vbus status

 * @adjust_channel_params: pre check for standard dma channel_program func
@@ -196,7 +197,7 @@ struct musb_platform_ops { 
	void	(*write_fifo)(struct musb_hw_ep *hw_ep, u16 len, const u8 *buf);

	int	(*set_mode)(struct musb *musb, u8 mode);

	void	(*try_idle)(struct musb *musb, unsigned long timeout);

	int	(*reset)(struct musb *musb);

	int	(*recover)(struct musb *musb);



	int	(*vbus_status)(struct musb *musb);

	void	(*set_vbus)(struct musb *musb, int on);
@@ -558,12 +559,12 @@ static inline void musb_platform_try_idle(struct musb *musb, 
		musb->ops->try_idle(musb, timeout);

}



static inline int  musb_platform_reset(struct musb *musb)

static inline int  musb_platform_recover(struct musb *musb)

{

	if (!musb->ops->reset)

		return -EINVAL;

	if (!musb->ops->recover)

		return 0;



	return musb->ops->reset(musb);

	return musb->ops->recover(musb);

}



static inline int musb_platform_get_vbus_status(struct musb *musb)

drivers/usb/musb/musb_dsps.c

+2 −2
Original line number Diff line number Diff line
@@ -600,7 +600,7 @@ static bool dsps_sw_babble_control(struct musb *musb) 
	return session_restart;

}



static int dsps_musb_reset(struct musb *musb)

static int dsps_musb_recover(struct musb *musb)

{

	struct device *dev = musb->controller;

	struct dsps_glue *glue = dev_get_drvdata(dev->parent);
@@ -624,7 +624,7 @@ static struct musb_platform_ops dsps_ops = { 


	.try_idle	= dsps_musb_try_idle,

	.set_mode	= dsps_musb_set_mode,

	.reset		= dsps_musb_reset,

	.recover	= dsps_musb_recover,

};



static u64 musb_dmamask = DMA_BIT_MASK(32);