From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [4.14,024/165] usb/phy: fix PPC64 build errors in phy-fsl-usb.c From: Greg Kroah-Hartman Message-Id: <20180903165656.241065950@linuxfoundation.org> Date: Mon, 3 Sep 2018 18:55:10 +0200 To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Randy Dunlap , Felipe Balbi , linux-usb@vger.kernel.org, Michael Ellerman , linuxppc-dev@lists.ozlabs.org, Felipe Balbi , Sasha Levin List-ID: NC4xNC1zdGFibGUgcmV2aWV3IHBhdGNoLiAgSWYgYW55b25lIGhhcyBhbnkgb2JqZWN0aW9ucywg cGxlYXNlIGxldCBtZSBrbm93LgoKLS0tLS0tLS0tLS0tLS0tLS0tCgpGcm9tOiBSYW5keSBEdW5s YXAgPHJkdW5sYXBAaW5mcmFkZWFkLm9yZz4KClsgVXBzdHJlYW0gY29tbWl0IGEzOWJhOTBhMWNj NzAxMGVkYjBhNzEzMmUxYjY3ZjNkODBiOTk0ZTkgXQoKRml4IGJ1aWxkIGVycm9ycyB3aGVuIGJ1 aWx0IGZvciBQUEM2NDoKVGhlc2UgdmFyaWFibGVzIGFyZSBvbmx5IHVzZWQgb24gUFBDMzIgc28g dGhleSBkb24ndCBuZWVkIHRvIGJlCmluaXRpYWxpemVkIGZvciBQUEM2NC4KCi4uL2RyaXZlcnMv dXNiL3BoeS9waHktZnNsLXVzYi5jOiBJbiBmdW5jdGlvbiAndXNiX290Z19zdGFydCc6Ci4uL2Ry aXZlcnMvdXNiL3BoeS9waHktZnNsLXVzYi5jOjg2NTozOiBlcnJvcjogJ19mc2xfcmVhZGwnIHVu ZGVjbGFyZWQgKGZpcnN0IHVzZSBpbiB0aGlzIGZ1bmN0aW9uKTsgZGlkIHlvdSBtZWFuICdmc2xf cmVhZGwnPwogICBfZnNsX3JlYWRsID0gX2ZzbF9yZWFkbF9iZTsKLi4vZHJpdmVycy91c2IvcGh5 L3BoeS1mc2wtdXNiLmM6ODY1OjE2OiBlcnJvcjogJ19mc2xfcmVhZGxfYmUnIHVuZGVjbGFyZWQg KGZpcnN0IHVzZSBpbiB0aGlzIGZ1bmN0aW9uKTsgZGlkIHlvdSBtZWFuICdmc2xfcmVhZGwnPwog ICBfZnNsX3JlYWRsID0gX2ZzbF9yZWFkbF9iZTsKLi4vZHJpdmVycy91c2IvcGh5L3BoeS1mc2wt dXNiLmM6ODY2OjM6IGVycm9yOiAnX2ZzbF93cml0ZWwnIHVuZGVjbGFyZWQgKGZpcnN0IHVzZSBp biB0aGlzIGZ1bmN0aW9uKTsgZGlkIHlvdSBtZWFuICdmc2xfd3JpdGVsJz8KICAgX2ZzbF93cml0 ZWwgPSBfZnNsX3dyaXRlbF9iZTsKLi4vZHJpdmVycy91c2IvcGh5L3BoeS1mc2wtdXNiLmM6ODY2 OjE3OiBlcnJvcjogJ19mc2xfd3JpdGVsX2JlJyB1bmRlY2xhcmVkIChmaXJzdCB1c2UgaW4gdGhp cyBmdW5jdGlvbik7IGRpZCB5b3UgbWVhbiAnZnNsX3dyaXRlbCc/CiAgIF9mc2xfd3JpdGVsID0g X2ZzbF93cml0ZWxfYmU7Ci4uL2RyaXZlcnMvdXNiL3BoeS9waHktZnNsLXVzYi5jOjg2ODoxNjog ZXJyb3I6ICdfZnNsX3JlYWRsX2xlJyB1bmRlY2xhcmVkIChmaXJzdCB1c2UgaW4gdGhpcyBmdW5j dGlvbik7IGRpZCB5b3UgbWVhbiAnZnNsX3JlYWRsJz8KICAgX2ZzbF9yZWFkbCA9IF9mc2xfcmVh ZGxfbGU7Ci4uL2RyaXZlcnMvdXNiL3BoeS9waHktZnNsLXVzYi5jOjg2OToxNzogZXJyb3I6ICdf ZnNsX3dyaXRlbF9sZScgdW5kZWNsYXJlZCAoZmlyc3QgdXNlIGluIHRoaXMgZnVuY3Rpb24pOyBk aWQgeW91IG1lYW4gJ2ZzbF93cml0ZWwnPwogICBfZnNsX3dyaXRlbCA9IF9mc2xfd3JpdGVsX2xl OwoKYW5kIHRoZSBzeXNmcyAic2hvdyIgZnVuY3Rpb24gcmV0dXJuIHR5cGUgc2hvdWxkIGJlIHNz aXplX3QsIG5vdCBpbnQ6CgouLi9kcml2ZXJzL3VzYi9waHkvcGh5LWZzbC11c2IuYzoxMDQyOjQ5 OiBlcnJvcjogaW5pdGlhbGl6YXRpb24gb2YgJ3NzaXplX3QgKCopKHN0cnVjdCBkZXZpY2UgKiwg c3RydWN0IGRldmljZV9hdHRyaWJ1dGUgKiwgY2hhciAqKScge2FrYSAnbG9uZyBpbnQgKCopKHN0 cnVjdCBkZXZpY2UgKiwgc3RydWN0IGRldmljZV9hdHRyaWJ1dGUgKiwgY2hhciAqKSd9IGZyb20g aW5jb21wYXRpYmxlIHBvaW50ZXIgdHlwZSAnaW50ICgqKShzdHJ1Y3QgZGV2aWNlICosIHN0cnVj dCBkZXZpY2VfYXR0cmlidXRlICosIGNoYXIgKiknIFstV2Vycm9yPWluY29tcGF0aWJsZS1wb2lu dGVyLXR5cGVzXQogc3RhdGljIERFVklDRV9BVFRSKGZzbF91c2IyX290Z19zdGF0ZSwgU19JUlVH Tywgc2hvd19mc2xfdXNiMl9vdGdfc3RhdGUsIE5VTEwpOwoKU2lnbmVkLW9mZi1ieTogUmFuZHkg RHVubGFwIDxyZHVubGFwQGluZnJhZGVhZC5vcmc+CkNjOiBGZWxpcGUgQmFsYmkgPGJhbGJpQGtl cm5lbC5vcmc+CkNjOiBsaW51eC11c2JAdmdlci5rZXJuZWwub3JnCkNjOiBNaWNoYWVsIEVsbGVy bWFuIDxtcGVAZWxsZXJtYW4uaWQuYXU+CkNjOiBsaW51eHBwYy1kZXZAbGlzdHMub3psYWJzLm9y ZwpTaWduZWQtb2ZmLWJ5OiBGZWxpcGUgQmFsYmkgPGZlbGlwZS5iYWxiaUBsaW51eC5pbnRlbC5j b20+ClNpZ25lZC1vZmYtYnk6IFNhc2hhIExldmluIDxhbGV4YW5kZXIubGV2aW5AbWljcm9zb2Z0 LmNvbT4KU2lnbmVkLW9mZi1ieTogR3JlZyBLcm9haC1IYXJ0bWFuIDxncmVna2hAbGludXhmb3Vu ZGF0aW9uLm9yZz4KLS0tCiBkcml2ZXJzL3VzYi9waHkvcGh5LWZzbC11c2IuYyB8ICAgIDQgKysr LQogMSBmaWxlIGNoYW5nZWQsIDMgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbigtKQoKLS0tIGEv ZHJpdmVycy91c2IvcGh5L3BoeS1mc2wtdXNiLmMKKysrIGIvZHJpdmVycy91c2IvcGh5L3BoeS1m c2wtdXNiLmMKQEAgLTg3NCw2ICs4NzQsNyBAQCBpbnQgdXNiX290Z19zdGFydChzdHJ1Y3QgcGxh dGZvcm1fZGV2aWNlCiAJaWYgKHBkYXRhLT5pbml0ICYmIHBkYXRhLT5pbml0KHBkZXYpICE9IDAp CiAJCXJldHVybiAtRUlOVkFMOwogCisjaWZkZWYgQ09ORklHX1BQQzMyCiAJaWYgKHBkYXRhLT5i aWdfZW5kaWFuX21taW8pIHsKIAkJX2ZzbF9yZWFkbCA9IF9mc2xfcmVhZGxfYmU7CiAJCV9mc2xf d3JpdGVsID0gX2ZzbF93cml0ZWxfYmU7CkBAIC04ODEsNiArODgyLDcgQEAgaW50IHVzYl9vdGdf c3RhcnQoc3RydWN0IHBsYXRmb3JtX2RldmljZQogCQlfZnNsX3JlYWRsID0gX2ZzbF9yZWFkbF9s ZTsKIAkJX2ZzbF93cml0ZWwgPSBfZnNsX3dyaXRlbF9sZTsKIAl9CisjZW5kaWYKIAogCS8qIHJl cXVlc3QgaXJxICovCiAJcF9vdGctPmlycSA9IHBsYXRmb3JtX2dldF9pcnEocGRldiwgMCk7CkBA IC05NzEsNyArOTczLDcgQEAgaW50IHVzYl9vdGdfc3RhcnQoc3RydWN0IHBsYXRmb3JtX2Rldmlj ZQogLyoKICAqIHN0YXRlIGZpbGUgaW4gc3lzZnMKICAqLwotc3RhdGljIGludCBzaG93X2ZzbF91 c2IyX290Z19zdGF0ZShzdHJ1Y3QgZGV2aWNlICpkZXYsCitzdGF0aWMgc3NpemVfdCBzaG93X2Zz bF91c2IyX290Z19zdGF0ZShzdHJ1Y3QgZGV2aWNlICpkZXYsCiAJCQkJICAgc3RydWN0IGRldmlj ZV9hdHRyaWJ1dGUgKmF0dHIsIGNoYXIgKmJ1ZikKIHsKIAlzdHJ1Y3Qgb3RnX2ZzbSAqZnNtID0g JmZzbF9vdGdfZGV2LT5mc207Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 42438D4B5XzDqSL for ; Tue, 4 Sep 2018 07:32:12 +1000 (AEST) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Randy Dunlap , Felipe Balbi , linux-usb@vger.kernel.org, Michael Ellerman , linuxppc-dev@lists.ozlabs.org, Felipe Balbi , Sasha Levin Subject: [PATCH 4.14 024/165] usb/phy: fix PPC64 build errors in phy-fsl-usb.c Date: Mon, 3 Sep 2018 18:55:10 +0200 Message-Id: <20180903165656.241065950@linuxfoundation.org> In-Reply-To: <20180903165655.003605184@linuxfoundation.org> References: <20180903165655.003605184@linuxfoundation.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Randy Dunlap [ Upstream commit a39ba90a1cc7010edb0a7132e1b67f3d80b994e9 ] 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 Cc: Felipe Balbi Cc: linux-usb@vger.kernel.org Cc: Michael Ellerman Cc: linuxppc-dev@lists.ozlabs.org Signed-off-by: Felipe Balbi Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/usb/phy/phy-fsl-usb.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/drivers/usb/phy/phy-fsl-usb.c +++ b/drivers/usb/phy/phy-fsl-usb.c @@ -874,6 +874,7 @@ int usb_otg_start(struct platform_device if (pdata->init && pdata->init(pdev) != 0) return -EINVAL; +#ifdef CONFIG_PPC32 if (pdata->big_endian_mmio) { _fsl_readl = _fsl_readl_be; _fsl_writel = _fsl_writel_be; @@ -881,6 +882,7 @@ int usb_otg_start(struct platform_device _fsl_readl = _fsl_readl_le; _fsl_writel = _fsl_writel_le; } +#endif /* request irq */ p_otg->irq = platform_get_irq(pdev, 0); @@ -971,7 +973,7 @@ int usb_otg_start(struct platform_device /* * 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 otg_fsm *fsm = &fsl_otg_dev->fsm;