Commit a39ba90a authored Jul 15, 2018 by Randy Dunlap Committed by Felipe Balbi Jul 17, 2018

usb/phy: fix PPC64 build errors in phy-fsl-usb.c



Fix build errors when built for PPC64:
These variables are only used on PPC32 so they don't need to be
initialized for PPC64.

../drivers/usb/phy/phy-fsl-usb.c: In function 'usb_otg_start':
../drivers/usb/phy/phy-fsl-usb.c:865:3: error: '_fsl_readl' undeclared (first use in this function); did you mean 'fsl_readl'?
   _fsl_readl = _fsl_readl_be;
../drivers/usb/phy/phy-fsl-usb.c:865:16: error: '_fsl_readl_be' undeclared (first use in this function); did you mean 'fsl_readl'?
   _fsl_readl = _fsl_readl_be;
../drivers/usb/phy/phy-fsl-usb.c:866:3: error: '_fsl_writel' undeclared (first use in this function); did you mean 'fsl_writel'?
   _fsl_writel = _fsl_writel_be;
../drivers/usb/phy/phy-fsl-usb.c:866:17: error: '_fsl_writel_be' undeclared (first use in this function); did you mean 'fsl_writel'?
   _fsl_writel = _fsl_writel_be;
../drivers/usb/phy/phy-fsl-usb.c:868:16: error: '_fsl_readl_le' undeclared (first use in this function); did you mean 'fsl_readl'?
   _fsl_readl = _fsl_readl_le;
../drivers/usb/phy/phy-fsl-usb.c:869:17: error: '_fsl_writel_le' undeclared (first use in this function); did you mean 'fsl_writel'?
   _fsl_writel = _fsl_writel_le;

and the sysfs "show" function return type should be ssize_t, not int:

../drivers/usb/phy/phy-fsl-usb.c:1042:49: error: initialization of 'ssize_t (*)(struct device *, struct device_attribute *, char *)' {aka 'long int (*)(struct device *, struct device_attribute *, char *)'} from incompatible pointer type 'int (*)(struct device *, struct device_attribute *, char *)' [-Werror=incompatible-pointer-types]
 static DEVICE_ATTR(fsl_usb2_otg_state, S_IRUGO, show_fsl_usb2_otg_state, NULL);

Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Felipe Balbi <balbi@kernel.org>
Cc: linux-usb@vger.kernel.org
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: linuxppc-dev@lists.ozlabs.org
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>

parent b3eb981b

drivers/usb/phy/phy-fsl-usb.c

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -861,6 +861,7 @@ int usb_otg_start(struct platform_device *pdev)
	if (pdata->init && pdata->init(pdev) != 0)		if (pdata->init && pdata->init(pdev) != 0)
	return -EINVAL;		return -EINVAL;

			#ifdef CONFIG_PPC32
	if (pdata->big_endian_mmio) {		if (pdata->big_endian_mmio) {
	_fsl_readl = _fsl_readl_be;		_fsl_readl = _fsl_readl_be;
	_fsl_writel = _fsl_writel_be;		_fsl_writel = _fsl_writel_be;
	@@ -868,6 +869,7 @@ int usb_otg_start(struct platform_device *pdev)
	_fsl_readl = _fsl_readl_le;		_fsl_readl = _fsl_readl_le;
	_fsl_writel = _fsl_writel_le;		_fsl_writel = _fsl_writel_le;
	}		}
			#endif

	/* request irq */		/* request irq */
	p_otg->irq = platform_get_irq(pdev, 0);		p_otg->irq = platform_get_irq(pdev, 0);
	@@ -958,7 +960,7 @@ int usb_otg_start(struct platform_device *pdev)
	/*		/*
	* state file in sysfs		* state file in sysfs
	*/		*/
	static int show_fsl_usb2_otg_state(struct device *dev,		static ssize_t show_fsl_usb2_otg_state(struct device *dev,
	struct device_attribute attr, char buf)		struct device_attribute attr, char buf)
	{		{
	struct otg_fsm *fsm = &fsl_otg_dev->fsm;		struct otg_fsm *fsm = &fsl_otg_dev->fsm;