usb: dwc3: fix up for role switch API change (0339f7fb) · Commits · 戴 / test

After merging the usb-gadget tree, today's linux-next build (arm multi_v7_defconfig) failed like this: drivers/usb/dwc3/drd.c: In function 'dwc3_setup_role_switch': drivers/usb/dwc3/drd.c:551:23: error: assignment to 'usb_role_switch_set_t' {aka 'int (*)(struct usb_role_switch *, enum usb_role)'} from incompatible pointer type 'int (*)(struct device *, enum usb_role)' [-Werror=incompatible-pointer-types] 551 | dwc3_role_switch.set = dwc3_usb_role_switch_set; | ^ drivers/usb/dwc3/drd.c:552:23: error: assignment to 'usb_role_switch_get_t' {aka 'enum usb_role (*)(struct usb_role_switch *)'} from incompatible pointer type 'enum usb_role (*)(struct device *)' [-Werror=incompatible-pointer-types] 552 | dwc3_role_switch.get = dwc3_usb_role_switch_get; | ^ Caused by commit ("usb: dwc3: Registering a role switch in the DRD code.") interacting with commit ("usb: roles: Provide the switch drivers handle to the switch in the API") from the usb tree. Signed-off-by:

Stephen Rothwell <sfr@canb.auug.org.au> Link: https://lore.kernel.org/r/20200316143752.473f1073@canb.auug.org.au Signed-off-by:

Greg Kroah-Hartman <gregkh@linuxfoundation.org>

drivers/usb/dwc3/drd.c

+6 −4

Original line number	Original line	Diff line number	Diff line
	@@ -478,9 +478,10 @@ static struct extcon_dev dwc3_get_extcon(struct dwc3 dwc)

	#if IS_ENABLED(CONFIG_USB_ROLE_SWITCH)		#if IS_ENABLED(CONFIG_USB_ROLE_SWITCH)
	#define ROLE_SWITCH 1		#define ROLE_SWITCH 1
	static int dwc3_usb_role_switch_set(struct device *dev, enum usb_role role)		static int dwc3_usb_role_switch_set(struct usb_role_switch *sw,
			enum usb_role role)
	{		{
	struct dwc3 *dwc = dev_get_drvdata(dev);		struct dwc3 *dwc = usb_role_switch_get_drvdata(sw);
	u32 mode;		u32 mode;

	switch (role) {		switch (role) {
	@@ -502,9 +503,9 @@ static int dwc3_usb_role_switch_set(struct device *dev, enum usb_role role)
	return 0;		return 0;
	}		}

	static enum usb_role dwc3_usb_role_switch_get(struct device *dev)		static enum usb_role dwc3_usb_role_switch_get(struct usb_role_switch *sw)
	{		{
	struct dwc3 *dwc = dev_get_drvdata(dev);		struct dwc3 *dwc = usb_role_switch_get_drvdata(sw);
	unsigned long flags;		unsigned long flags;
	enum usb_role role;		enum usb_role role;

	@@ -550,6 +551,7 @@ static int dwc3_setup_role_switch(struct dwc3 *dwc)
	dwc3_role_switch.fwnode = dev_fwnode(dwc->dev);		dwc3_role_switch.fwnode = dev_fwnode(dwc->dev);
	dwc3_role_switch.set = dwc3_usb_role_switch_set;		dwc3_role_switch.set = dwc3_usb_role_switch_set;
	dwc3_role_switch.get = dwc3_usb_role_switch_get;		dwc3_role_switch.get = dwc3_usb_role_switch_get;
			dwc3_role_switch.driver_data = dwc;
	dwc->role_sw = usb_role_switch_register(dwc->dev, &dwc3_role_switch);		dwc->role_sw = usb_role_switch_register(dwc->dev, &dwc3_role_switch);
	if (IS_ERR(dwc->role_sw))		if (IS_ERR(dwc->role_sw))
	return PTR_ERR(dwc->role_sw);		return PTR_ERR(dwc->role_sw);

Admin message