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: [1/7] usb: musb: Silence error about blacklisting hubs if !CONFIG_USB From: Bin Liu Message-Id: <20190430145942.1128-2-b-liu@ti.com> Date: Tue, 30 Apr 2019 09:59:35 -0500 To: Greg Kroah-Hartman Cc: linux-usb@vger.kernel.org, Bin Liu List-ID: RnJvbTogUGF1bCBDZXJjdWVpbCA8cGF1bEBjcmFwb3VpbGxvdS5uZXQ+CgpTb21lIGRyaXZlcnMs IGxpa2Ugano0NzQwLW11c2IsIGRvbid0IGRlcGVuZCBvbiBDT05GSUdfVVNCLgoKU2lnbmVkLW9m Zi1ieTogUGF1bCBDZXJjdWVpbCA8cGF1bEBjcmFwb3VpbGxvdS5uZXQ+ClNpZ25lZC1vZmYtYnk6 IEJpbiBMaXUgPGItbGl1QHRpLmNvbT4KLS0tCiBkcml2ZXJzL3VzYi9tdXNiL211c2JfY29yZS5j IHwgOSArKysrKy0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA1IGluc2VydGlvbnMoKyksIDQgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy91c2IvbXVzYi9tdXNiX2NvcmUuYyBiL2RyaXZl cnMvdXNiL211c2IvbXVzYl9jb3JlLmMKaW5kZXggYjdkNTYyNzJmOWQxLi45ZjVhNDgxOWE3NDQg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvdXNiL211c2IvbXVzYl9jb3JlLmMKKysrIGIvZHJpdmVycy91 c2IvbXVzYi9tdXNiX2NvcmUuYwpAQCAtMTQ5NywxMCArMTQ5NywxMSBAQCBzdGF0aWMgaW50IG11 c2JfY29yZV9pbml0KHUxNiBtdXNiX3R5cGUsIHN0cnVjdCBtdXNiICptdXNiKQogCX0gZWxzZSB7 CiAJCW11c2ItPmlzX211bHRpcG9pbnQgPSAwOwogCQl0eXBlID0gIiI7Ci0jaWZuZGVmCUNPTkZJ R19VU0JfT1RHX0JMQUNLTElTVF9IVUIKLQkJcHJfZXJyKCIlczoga2VybmVsIG11c3QgYmxhY2ts aXN0IGV4dGVybmFsIGh1YnNcbiIsCi0JCSAgICAgICBtdXNiX2RyaXZlcl9uYW1lKTsKLSNlbmRp ZgorCQlpZiAoSVNfRU5BQkxFRChDT05GSUdfVVNCKSAmJgorCQkgICAgIUlTX0VOQUJMRUQoQ09O RklHX1VTQl9PVEdfQkxBQ0tMSVNUX0hVQikpIHsKKwkJCXByX2VycigiJXM6IGtlcm5lbCBtdXN0 IGJsYWNrbGlzdCBleHRlcm5hbCBodWJzXG4iLAorCQkJICAgICAgIG11c2JfZHJpdmVyX25hbWUp OworCQl9CiAJfQogCiAJLyogbG9nIHJlbGVhc2UgaW5mbyAqLwo= 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=-9.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,T_DKIMWL_WL_HIGH,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 23A09C04AA6 for ; Tue, 30 Apr 2019 14:59:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DE78B20652 for ; Tue, 30 Apr 2019 14:59:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b="L+Rbulie" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726203AbfD3O7o (ORCPT ); Tue, 30 Apr 2019 10:59:44 -0400 Received: from fllv0016.ext.ti.com ([198.47.19.142]:50714 "EHLO fllv0016.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725942AbfD3O7o (ORCPT ); Tue, 30 Apr 2019 10:59:44 -0400 Received: from fllv0034.itg.ti.com ([10.64.40.246]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id x3UExhYw099560; Tue, 30 Apr 2019 09:59:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1556636383; bh=CqGB2it6Oy7RcyB1UYjgCuckA4m0QG/iRmito1ndwDE=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=L+RbulieFXLM2Rx9r9TZ/k9pdmMfqMh6rv+9xGXrD9gjMaOazQGwkQULtceyrrH9R TGAlXNnW4pc9ngbcnbTFdYcKPa5cQKcRLqb0AdUN1nj+7drBvwmpgZDSMLVwQ8jUiC y65EC+tgaonfCkSb4lcAt9wvUBrb3EwETPeubcOI= Received: from DFLE106.ent.ti.com (dfle106.ent.ti.com [10.64.6.27]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id x3UExhLx035161 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 30 Apr 2019 09:59:43 -0500 Received: from DFLE103.ent.ti.com (10.64.6.24) by DFLE106.ent.ti.com (10.64.6.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5; Tue, 30 Apr 2019 09:59:42 -0500 Received: from lelv0326.itg.ti.com (10.180.67.84) by DFLE103.ent.ti.com (10.64.6.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5 via Frontend Transport; Tue, 30 Apr 2019 09:59:42 -0500 Received: from uda0271908.am.dhcp.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id x3UExgrB071248; Tue, 30 Apr 2019 09:59:42 -0500 From: Bin Liu To: Greg Kroah-Hartman CC: , Bin Liu Subject: [PATCH 1/7] usb: musb: Silence error about blacklisting hubs if !CONFIG_USB Date: Tue, 30 Apr 2019 09:59:35 -0500 Message-ID: <20190430145942.1128-2-b-liu@ti.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190430145942.1128-1-b-liu@ti.com> References: <20190430145942.1128-1-b-liu@ti.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Message-ID: <20190430145935.mPaGo9qXu_ej_bmLdNGuh7UaAYyocfsNY7fBgU6mdB4@z> From: Paul Cercueil Some drivers, like jz4740-musb, don't depend on CONFIG_USB. Signed-off-by: Paul Cercueil Signed-off-by: Bin Liu --- drivers/usb/musb/musb_core.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c index b7d56272f9d1..9f5a4819a744 100644 --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c @@ -1497,10 +1497,11 @@ static int musb_core_init(u16 musb_type, struct musb *musb) } else { musb->is_multipoint = 0; type = ""; -#ifndef CONFIG_USB_OTG_BLACKLIST_HUB - pr_err("%s: kernel must blacklist external hubs\n", - musb_driver_name); -#endif + if (IS_ENABLED(CONFIG_USB) && + !IS_ENABLED(CONFIG_USB_OTG_BLACKLIST_HUB)) { + pr_err("%s: kernel must blacklist external hubs\n", + musb_driver_name); + } } /* log release info */ -- 2.17.1