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

Commit 225da3e3 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Felipe Balbi
Browse files

usb: renesas_usbhs: fixup sparse errors for common.c 



This patch fixup below sparse errors

CHECK   ${RENESAS_USB}/common.c
${RENESAS_USB}/common.c:313:17: error: incompatible types in conditional expression (different base types)
${RENESAS_USB}/common.c:322:17: error: incompatible types in conditional expression (different base types)
${RENESAS_USB}/common.c:384:17: error: incompatible types in conditional expression (different base types)
${RENESAS_USB}/common.c:524:9: error: incompatible types in conditional expression (different base types)
${RENESAS_USB}/common.c:545:9: error: incompatible types in conditional expression (different base types)
${RENESAS_USB}/common.c:574:9: error: incompatible types in conditional expression (different base types)
${RENESAS_USB}/common.c:606:9: error: incompatible types in conditional expression (different base types)
${RENESAS_USB}/mod_gadget.c:233:28: warning: symbol 'req_clear_feature' was not declared. Should it be static?
${RENESAS_USB}/mod_gadget.c:274:28: warning: symbol 'req_set_feature' was not declared. Should it be static?
${RENESAS_USB}/mod_gadget.c:375:28: warning: symbol 'req_get_status' was not declared. Should it be static?

[ balbi@ti.com : added three sparse fixes to mod_gadget.c ]

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent ef096542

arch/arm/mach-shmobile/board-armadillo800eva.c

+6 −2
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ static int usbhsf_get_id(struct platform_device *pdev) 
	return USBHS_GADGET;

}



static void usbhsf_power_ctrl(struct platform_device *pdev,

static int usbhsf_power_ctrl(struct platform_device *pdev,

			      void __iomem *base, int enable)

{

	struct usbhsf_private *priv = usbhsf_get_priv(pdev);
@@ -223,6 +223,8 @@ static void usbhsf_power_ctrl(struct platform_device *pdev, 
		clk_disable(priv->pci);		/* usb work around */

		clk_disable(priv->usb24);	/* usb work around */

	}



	return 0;

}



static int usbhsf_get_vbus(struct platform_device *pdev)
@@ -239,7 +241,7 @@ static irqreturn_t usbhsf_interrupt(int irq, void *data) 
	return IRQ_HANDLED;

}



static void usbhsf_hardware_exit(struct platform_device *pdev)

static int usbhsf_hardware_exit(struct platform_device *pdev)

{

	struct usbhsf_private *priv = usbhsf_get_priv(pdev);
@@ -264,6 +266,8 @@ static void usbhsf_hardware_exit(struct platform_device *pdev) 
	priv->usbh_base	= NULL;



	free_irq(IRQ7, pdev);



	return 0;

}



static int usbhsf_hardware_init(struct platform_device *pdev)

arch/arm/mach-shmobile/board-kzm9g.c

+6 −2
Original line number Diff line number Diff line
@@ -155,12 +155,14 @@ static int usbhs_get_vbus(struct platform_device *pdev) 
	return !((1 << 7) & __raw_readw(priv->cr2));

}



static void usbhs_phy_reset(struct platform_device *pdev)

static int usbhs_phy_reset(struct platform_device *pdev)

{

	struct usbhs_private *priv = usbhs_get_priv(pdev);



	/* init phy */

	__raw_writew(0x8a0a, priv->cr2);



	return 0;

}



static int usbhs_get_id(struct platform_device *pdev)
@@ -202,7 +204,7 @@ static int usbhs_hardware_init(struct platform_device *pdev) 
	return 0;

}



static void usbhs_hardware_exit(struct platform_device *pdev)

static int usbhs_hardware_exit(struct platform_device *pdev)

{

	struct usbhs_private *priv = usbhs_get_priv(pdev);
@@ -210,6 +212,8 @@ static void usbhs_hardware_exit(struct platform_device *pdev) 
	__raw_writew(USB_PHY_MODE | USB_PHY_INT_CLR, priv->phy);



	free_irq(IRQ15, pdev);



	return 0;

}



static u32 usbhs_pipe_cfg[] = {

arch/arm/mach-shmobile/board-mackerel.c

+9 −3
Original line number Diff line number Diff line
@@ -596,12 +596,14 @@ static int usbhs_get_vbus(struct platform_device *pdev) 
	return usbhs_is_connected(usbhs_get_priv(pdev));

}



static void usbhs_phy_reset(struct platform_device *pdev)

static int usbhs_phy_reset(struct platform_device *pdev)

{

	struct usbhs_private *priv = usbhs_get_priv(pdev);



	/* init phy */

	__raw_writew(0x8a0a, priv->usbcrcaddr);



	return 0;

}



static int usbhs0_get_id(struct platform_device *pdev)
@@ -628,11 +630,13 @@ static int usbhs0_hardware_init(struct platform_device *pdev) 
	return 0;

}



static void usbhs0_hardware_exit(struct platform_device *pdev)

static int usbhs0_hardware_exit(struct platform_device *pdev)

{

	struct usbhs_private *priv = usbhs_get_priv(pdev);



	cancel_delayed_work_sync(&priv->work);



	return 0;

}



static struct usbhs_private usbhs0_private = {
@@ -735,7 +739,7 @@ static int usbhs1_hardware_init(struct platform_device *pdev) 
	return 0;

}



static void usbhs1_hardware_exit(struct platform_device *pdev)

static int usbhs1_hardware_exit(struct platform_device *pdev)

{

	struct usbhs_private *priv = usbhs_get_priv(pdev);
@@ -743,6 +747,8 @@ static void usbhs1_hardware_exit(struct platform_device *pdev) 
	__raw_writew(USB_PHY_MODE | USB_PHY_INT_CLR, priv->usbphyaddr);



	free_irq(IRQ8, pdev);



	return 0;

}



static int usbhs1_get_id(struct platform_device *pdev)

arch/sh/boards/mach-ecovec24/setup.c

+3 −1
Original line number Diff line number Diff line
@@ -254,11 +254,13 @@ static int usbhs_get_id(struct platform_device *pdev) 
	return gpio_get_value(GPIO_PTB3);

}



static void usbhs_phy_reset(struct platform_device *pdev)

static int usbhs_phy_reset(struct platform_device *pdev)

{

	/* enable vbus if HOST */

	if (!gpio_get_value(GPIO_PTB3))

		gpio_set_value(GPIO_PTB5, 1);



	return 0;

}



static struct renesas_usbhs_platform_info usbhs_info = {

drivers/usb/renesas_usbhs/mod_gadget.c

+3 −3
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ static int usbhsg_recip_handler_std_clear_endpoint(struct usbhs_priv *priv, 
	return 0;

}



struct usbhsg_recip_handle req_clear_feature = {

static struct usbhsg_recip_handle req_clear_feature = {

	.name		= "clear feature",

	.device		= usbhsg_recip_handler_std_control_done,

	.interface	= usbhsg_recip_handler_std_control_done,
@@ -271,7 +271,7 @@ static int usbhsg_recip_handler_std_set_endpoint(struct usbhs_priv *priv, 
	return 0;

}



struct usbhsg_recip_handle req_set_feature = {

static struct usbhsg_recip_handle req_set_feature = {

	.name		= "set feature",

	.device		= usbhsg_recip_handler_std_set_device,

	.interface	= usbhsg_recip_handler_std_control_done,
@@ -372,7 +372,7 @@ static int usbhsg_recip_handler_std_get_endpoint(struct usbhs_priv *priv, 
	return 0;

}



struct usbhsg_recip_handle req_get_status = {

static struct usbhsg_recip_handle req_get_status = {

	.name		= "get status",

	.device		= usbhsg_recip_handler_std_get_device,

	.interface	= usbhsg_recip_handler_std_get_interface,