From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 06884C43334 for ; Mon, 3 Sep 2018 16:53:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B917720868 for ; Mon, 3 Sep 2018 16:53:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B917720868 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728807AbeICVOY (ORCPT ); Mon, 3 Sep 2018 17:14:24 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:38126 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728794AbeICVOX (ORCPT ); Mon, 3 Sep 2018 17:14:23 -0400 Received: from localhost (ip-213-127-74-90.ip.prioritytelecom.net [213.127.74.90]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 87D75CF3; Mon, 3 Sep 2018 16:53:25 +0000 (UTC) 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.4 14/80] usb/phy: fix PPC64 build errors in phy-fsl-usb.c Date: Mon, 3 Sep 2018 18:48:52 +0200 Message-Id: <20180903164934.723075049@linuxfoundation.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180903164934.171677301@linuxfoundation.org> References: <20180903164934.171677301@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.4-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 @@ -879,6 +879,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; @@ -886,6 +887,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); @@ -976,7 +978,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; 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.4,14/80] usb/phy: fix PPC64 build errors in phy-fsl-usb.c From: Greg Kroah-Hartman Message-Id: <20180903164934.723075049@linuxfoundation.org> Date: Mon, 3 Sep 2018 18:48:52 +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: NC40LXN0YWJsZSByZXZpZXcgcGF0Y2guICBJZiBhbnlvbmUgaGFzIGFueSBvYmplY3Rpb25zLCBw bGVhc2UgbGV0IG1lIGtub3cuCgotLS0tLS0tLS0tLS0tLS0tLS0KCkZyb206IFJhbmR5IER1bmxh cCA8cmR1bmxhcEBpbmZyYWRlYWQub3JnPgoKWyBVcHN0cmVhbSBjb21taXQgYTM5YmE5MGExY2M3 MDEwZWRiMGE3MTMyZTFiNjdmM2Q4MGI5OTRlOSBdCgpGaXggYnVpbGQgZXJyb3JzIHdoZW4gYnVp bHQgZm9yIFBQQzY0OgpUaGVzZSB2YXJpYWJsZXMgYXJlIG9ubHkgdXNlZCBvbiBQUEMzMiBzbyB0 aGV5IGRvbid0IG5lZWQgdG8gYmUKaW5pdGlhbGl6ZWQgZm9yIFBQQzY0LgoKLi4vZHJpdmVycy91 c2IvcGh5L3BoeS1mc2wtdXNiLmM6IEluIGZ1bmN0aW9uICd1c2Jfb3RnX3N0YXJ0JzoKLi4vZHJp dmVycy91c2IvcGh5L3BoeS1mc2wtdXNiLmM6ODY1OjM6IGVycm9yOiAnX2ZzbF9yZWFkbCcgdW5k ZWNsYXJlZCAoZmlyc3QgdXNlIGluIHRoaXMgZnVuY3Rpb24pOyBkaWQgeW91IG1lYW4gJ2ZzbF9y ZWFkbCc/CiAgIF9mc2xfcmVhZGwgPSBfZnNsX3JlYWRsX2JlOwouLi9kcml2ZXJzL3VzYi9waHkv cGh5LWZzbC11c2IuYzo4NjU6MTY6IGVycm9yOiAnX2ZzbF9yZWFkbF9iZScgdW5kZWNsYXJlZCAo Zmlyc3QgdXNlIGluIHRoaXMgZnVuY3Rpb24pOyBkaWQgeW91IG1lYW4gJ2ZzbF9yZWFkbCc/CiAg IF9mc2xfcmVhZGwgPSBfZnNsX3JlYWRsX2JlOwouLi9kcml2ZXJzL3VzYi9waHkvcGh5LWZzbC11 c2IuYzo4NjY6MzogZXJyb3I6ICdfZnNsX3dyaXRlbCcgdW5kZWNsYXJlZCAoZmlyc3QgdXNlIGlu IHRoaXMgZnVuY3Rpb24pOyBkaWQgeW91IG1lYW4gJ2ZzbF93cml0ZWwnPwogICBfZnNsX3dyaXRl bCA9IF9mc2xfd3JpdGVsX2JlOwouLi9kcml2ZXJzL3VzYi9waHkvcGh5LWZzbC11c2IuYzo4NjY6 MTc6IGVycm9yOiAnX2ZzbF93cml0ZWxfYmUnIHVuZGVjbGFyZWQgKGZpcnN0IHVzZSBpbiB0aGlz IGZ1bmN0aW9uKTsgZGlkIHlvdSBtZWFuICdmc2xfd3JpdGVsJz8KICAgX2ZzbF93cml0ZWwgPSBf ZnNsX3dyaXRlbF9iZTsKLi4vZHJpdmVycy91c2IvcGh5L3BoeS1mc2wtdXNiLmM6ODY4OjE2OiBl cnJvcjogJ19mc2xfcmVhZGxfbGUnIHVuZGVjbGFyZWQgKGZpcnN0IHVzZSBpbiB0aGlzIGZ1bmN0 aW9uKTsgZGlkIHlvdSBtZWFuICdmc2xfcmVhZGwnPwogICBfZnNsX3JlYWRsID0gX2ZzbF9yZWFk bF9sZTsKLi4vZHJpdmVycy91c2IvcGh5L3BoeS1mc2wtdXNiLmM6ODY5OjE3OiBlcnJvcjogJ19m c2xfd3JpdGVsX2xlJyB1bmRlY2xhcmVkIChmaXJzdCB1c2UgaW4gdGhpcyBmdW5jdGlvbik7IGRp ZCB5b3UgbWVhbiAnZnNsX3dyaXRlbCc/CiAgIF9mc2xfd3JpdGVsID0gX2ZzbF93cml0ZWxfbGU7 CgphbmQgdGhlIHN5c2ZzICJzaG93IiBmdW5jdGlvbiByZXR1cm4gdHlwZSBzaG91bGQgYmUgc3Np emVfdCwgbm90IGludDoKCi4uL2RyaXZlcnMvdXNiL3BoeS9waHktZnNsLXVzYi5jOjEwNDI6NDk6 IGVycm9yOiBpbml0aWFsaXphdGlvbiBvZiAnc3NpemVfdCAoKikoc3RydWN0IGRldmljZSAqLCBz dHJ1Y3QgZGV2aWNlX2F0dHJpYnV0ZSAqLCBjaGFyICopJyB7YWthICdsb25nIGludCAoKikoc3Ry dWN0IGRldmljZSAqLCBzdHJ1Y3QgZGV2aWNlX2F0dHJpYnV0ZSAqLCBjaGFyICopJ30gZnJvbSBp bmNvbXBhdGlibGUgcG9pbnRlciB0eXBlICdpbnQgKCopKHN0cnVjdCBkZXZpY2UgKiwgc3RydWN0 IGRldmljZV9hdHRyaWJ1dGUgKiwgY2hhciAqKScgWy1XZXJyb3I9aW5jb21wYXRpYmxlLXBvaW50 ZXItdHlwZXNdCiBzdGF0aWMgREVWSUNFX0FUVFIoZnNsX3VzYjJfb3RnX3N0YXRlLCBTX0lSVUdP LCBzaG93X2ZzbF91c2IyX290Z19zdGF0ZSwgTlVMTCk7CgpTaWduZWQtb2ZmLWJ5OiBSYW5keSBE dW5sYXAgPHJkdW5sYXBAaW5mcmFkZWFkLm9yZz4KQ2M6IEZlbGlwZSBCYWxiaSA8YmFsYmlAa2Vy bmVsLm9yZz4KQ2M6IGxpbnV4LXVzYkB2Z2VyLmtlcm5lbC5vcmcKQ2M6IE1pY2hhZWwgRWxsZXJt YW4gPG1wZUBlbGxlcm1hbi5pZC5hdT4KQ2M6IGxpbnV4cHBjLWRldkBsaXN0cy5vemxhYnMub3Jn ClNpZ25lZC1vZmYtYnk6IEZlbGlwZSBCYWxiaSA8ZmVsaXBlLmJhbGJpQGxpbnV4LmludGVsLmNv bT4KU2lnbmVkLW9mZi1ieTogU2FzaGEgTGV2aW4gPGFsZXhhbmRlci5sZXZpbkBtaWNyb3NvZnQu Y29tPgpTaWduZWQtb2ZmLWJ5OiBHcmVnIEtyb2FoLUhhcnRtYW4gPGdyZWdraEBsaW51eGZvdW5k YXRpb24ub3JnPgotLS0KIGRyaXZlcnMvdXNiL3BoeS9waHktZnNsLXVzYi5jIHwgICAgNCArKyst CiAxIGZpbGUgY2hhbmdlZCwgMyBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9uKC0pCgotLS0gYS9k cml2ZXJzL3VzYi9waHkvcGh5LWZzbC11c2IuYworKysgYi9kcml2ZXJzL3VzYi9waHkvcGh5LWZz bC11c2IuYwpAQCAtODc5LDYgKzg3OSw3IEBAIGludCB1c2Jfb3RnX3N0YXJ0KHN0cnVjdCBwbGF0 Zm9ybV9kZXZpY2UKIAlpZiAocGRhdGEtPmluaXQgJiYgcGRhdGEtPmluaXQocGRldikgIT0gMCkK IAkJcmV0dXJuIC1FSU5WQUw7CiAKKyNpZmRlZiBDT05GSUdfUFBDMzIKIAlpZiAocGRhdGEtPmJp Z19lbmRpYW5fbW1pbykgewogCQlfZnNsX3JlYWRsID0gX2ZzbF9yZWFkbF9iZTsKIAkJX2ZzbF93 cml0ZWwgPSBfZnNsX3dyaXRlbF9iZTsKQEAgLTg4Niw2ICs4ODcsNyBAQCBpbnQgdXNiX290Z19z dGFydChzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlCiAJCV9mc2xfcmVhZGwgPSBfZnNsX3JlYWRsX2xl OwogCQlfZnNsX3dyaXRlbCA9IF9mc2xfd3JpdGVsX2xlOwogCX0KKyNlbmRpZgogCiAJLyogcmVx dWVzdCBpcnEgKi8KIAlwX290Zy0+aXJxID0gcGxhdGZvcm1fZ2V0X2lycShwZGV2LCAwKTsKQEAg LTk3Niw3ICs5NzgsNyBAQCBpbnQgdXNiX290Z19zdGFydChzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNl CiAvKgogICogc3RhdGUgZmlsZSBpbiBzeXNmcwogICovCi1zdGF0aWMgaW50IHNob3dfZnNsX3Vz YjJfb3RnX3N0YXRlKHN0cnVjdCBkZXZpY2UgKmRldiwKK3N0YXRpYyBzc2l6ZV90IHNob3dfZnNs X3VzYjJfb3RnX3N0YXRlKHN0cnVjdCBkZXZpY2UgKmRldiwKIAkJCQkgICBzdHJ1Y3QgZGV2aWNl X2F0dHJpYnV0ZSAqYXR0ciwgY2hhciAqYnVmKQogewogCXN0cnVjdCBvdGdfZnNtICpmc20gPSAm ZnNsX290Z19kZXYtPmZzbTsK