Commit 0966648d authored by Yoshihiro Shimoda's avatar Yoshihiro Shimoda Committed by Greg Kroah-Hartman
Browse files

usb: renesas_usbhs: remove notify_hotplug callback 



The notify_hotplug callback was supported in v3.10, but the last user
(armadillo800eva) was removed by the commit 1fa59bda ("ARM: shmobile:
Remove legacy board code for Armadillo-800 EVA"). So, this patch
removes it.

Signed-off-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8fac4fee

drivers/usb/renesas_usbhs/common.c

+4 −12
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
 * Renesas USB driver

 *

 * Copyright (C) 2011 Renesas Solutions Corp.

 * Copyright (C) 2019 Renesas Electronics Corporation

 * Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

 */

#include <linux/clk.h>
@@ -513,7 +514,7 @@ static void usbhsc_notify_hotplug(struct work_struct *work) 
	usbhsc_hotplug(priv);

}



static int usbhsc_drvcllbck_notify_hotplug(struct platform_device *pdev)

int usbhsc_schedule_notify_hotplug(struct platform_device *pdev)

{

	struct usbhs_priv *priv = usbhs_pdev_to_priv(pdev);

	int delay = usbhs_get_dparam(priv, detection_delay);
@@ -667,7 +668,6 @@ static struct renesas_usbhs_platform_info *usbhs_parse_dt(struct device *dev) 
static int usbhs_probe(struct platform_device *pdev)

{

	struct renesas_usbhs_platform_info *info = renesas_usbhs_get_info(pdev);

	struct renesas_usbhs_driver_callback *dfunc;

	struct usbhs_priv *priv;

	struct resource *res, *irq_res;

	int ret;
@@ -721,10 +721,6 @@ static int usbhs_probe(struct platform_device *pdev) 
	}

	priv->pfunc = info->platform_callback;



	/* set driver callback functions for platform */

	dfunc			= &info->driver_callback;

	dfunc->notify_hotplug	= usbhsc_drvcllbck_notify_hotplug;



	/* set default param if platform doesn't have */

	if (!priv->dparam.pipe_configs) {

		priv->dparam.pipe_configs = usbhsc_default_pipe;
@@ -818,7 +814,7 @@ static int usbhs_probe(struct platform_device *pdev) 
	/*

	 * manual call notify_hotplug for cold plug

	 */

	usbhsc_drvcllbck_notify_hotplug(pdev);

	usbhsc_schedule_notify_hotplug(pdev);



	dev_info(&pdev->dev, "probed\n");
@@ -843,13 +839,9 @@ probe_end_pipe_exit: 
static int usbhs_remove(struct platform_device *pdev)

{

	struct usbhs_priv *priv = usbhs_pdev_to_priv(pdev);

	struct renesas_usbhs_platform_info *info = renesas_usbhs_get_info(pdev);

	struct renesas_usbhs_driver_callback *dfunc = &info->driver_callback;



	dev_dbg(&pdev->dev, "usb remove\n");



	dfunc->notify_hotplug = NULL;



	/* power off */

	if (!usbhs_get_dparam(priv, runtime_pwctrl))

		usbhsc_power_ctrl(priv, 0);
@@ -894,7 +886,7 @@ static __maybe_unused int usbhsc_resume(struct device *dev) 


	usbhs_platform_call(priv, phy_reset, pdev);



	usbhsc_drvcllbck_notify_hotplug(pdev);

	usbhsc_schedule_notify_hotplug(pdev);



	return 0;

}

drivers/usb/renesas_usbhs/common.h

+2 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
 * Renesas USB driver

 *

 * Copyright (C) 2011 Renesas Solutions Corp.

 * Copyright (C) 2019 Renesas Electronics Corporation

 * Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

 */

#ifndef RENESAS_USB_DRIVER_H
@@ -317,6 +318,7 @@ void usbhs_bus_send_sof_enable(struct usbhs_priv *priv); 
void usbhs_bus_send_reset(struct usbhs_priv *priv);

int usbhs_bus_get_speed(struct usbhs_priv *priv);

int usbhs_vbus_ctrl(struct usbhs_priv *priv, int enable);

int usbhsc_schedule_notify_hotplug(struct platform_device *pdev);



/*

 * frame

drivers/usb/renesas_usbhs/mod.c

+2 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
 * Renesas USB driver

 *

 * Copyright (C) 2011 Renesas Solutions Corp.

 * Copyright (C) 2019 Renesas Electronics Corporation

 * Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

 */

#include <linux/interrupt.h>
@@ -41,7 +42,7 @@ static int usbhsm_autonomy_irq_vbus(struct usbhs_priv *priv, 
{

	struct platform_device *pdev = usbhs_priv_to_pdev(priv);



	renesas_usbhs_call_notify_hotplug(pdev);

	usbhsc_schedule_notify_hotplug(pdev);



	return 0;

}

drivers/usb/renesas_usbhs/mod_gadget.c

+2 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
 * Renesas USB driver

 *

 * Copyright (C) 2011 Renesas Solutions Corp.

 * Copyright (C) 2019 Renesas Electronics Corporation

 * Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

 */

#include <linux/delay.h>
@@ -1023,7 +1024,7 @@ static int usbhsg_vbus_session(struct usb_gadget *gadget, int is_active) 


	gpriv->vbus_active = !!is_active;



	renesas_usbhs_call_notify_hotplug(pdev);

	usbhsc_schedule_notify_hotplug(pdev);



	return 0;

}

include/linux/usb/renesas_usbhs.h

+1 −25
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
 * Renesas USB

 *

 * Copyright (C) 2011 Renesas Solutions Corp.

 * Copyright (C) 2019 Renesas Electronics Corporation

 * Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

 *

 * This program is distributed in the hope that it will be useful,
@@ -32,17 +33,6 @@ enum { 
	USBHS_MAX,

};



/*

 * callback functions table for driver

 *

 * These functions are called from platform for driver.

 * Callback function's pointer will be set before

 * renesas_usbhs_platform_callback :: hardware_init was called

 */

struct renesas_usbhs_driver_callback {

	int (*notify_hotplug)(struct platform_device *pdev);

};



/*

 * callback functions for platform

 *
@@ -213,12 +203,6 @@ struct renesas_usbhs_platform_info { 
	 */

	struct renesas_usbhs_platform_callback	platform_callback;



	/*

	 * driver set these callback functions pointer.

	 * platform can use it on callback functions

	 */

	struct renesas_usbhs_driver_callback	driver_callback;



	/*

	 * option:

	 *
@@ -232,12 +216,4 @@ struct renesas_usbhs_platform_info { 
 */

#define renesas_usbhs_get_info(pdev)\

	((struct renesas_usbhs_platform_info *)(pdev)->dev.platform_data)



#define renesas_usbhs_call_notify_hotplug(pdev)				\

	({								\

		struct renesas_usbhs_driver_callback *dc;		\

		dc = &(renesas_usbhs_get_info(pdev)->driver_callback);	\

		if (dc && dc->notify_hotplug)				\

			dc->notify_hotplug(pdev);			\

	})

#endif /* RENESAS_USB_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE