From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: From: =?UTF-8?q?Pali=20Roh=C3=A1r?= Subject: [PATCH 09/11] mmc: sdio: Move SDIO IDs from b43-sdio driver to common include file Date: Fri, 22 May 2020 16:44:10 +0200 Message-Id: <20200522144412.19712-10-pali@kernel.org> In-Reply-To: <20200522144412.19712-1-pali@kernel.org> References: <20200522144412.19712-1-pali@kernel.org> MIME-Version: 1.0 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "ath10k" Errors-To: ath10k-bounces+kvalo=adurom.com@lists.infradead.org To: Ulf Hansson , linux-mmc@vger.kernel.org Cc: brcm80211-dev-list.pdl@broadcom.com, libertas-dev@lists.infradead.org, Xinming Hu , linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, Amitkumar Karwar , =?UTF-8?q?Marek=20Beh=C3=BAn?= , Ganapathi Bhat , ath10k@lists.infradead.org, Matthias Brugger , Mauro Carvalho Chehab , brcm80211-dev-list@cypress.com, Kalle Valo , b43-dev@lists.infradead.org RGVmaW5lIGFwcHJvcHJpYXRlIG1hY3JvIG5hbWVzIGZvciBjb25zaXN0ZW5jeSB3aXRoIG90aGVy IG1hY3Jvcy4KClNpZ25lZC1vZmYtYnk6IFBhbGkgUm9ow6FyIDxwYWxpQGtlcm5lbC5vcmc+Ci0t LQogZHJpdmVycy9uZXQvd2lyZWxlc3MvYnJvYWRjb20vYjQzL3NkaW8uYyB8IDQgKystLQogaW5j bHVkZS9saW51eC9tbWMvc2Rpb19pZHMuaCAgICAgICAgICAgICB8IDQgKysrKwogMiBmaWxlcyBj aGFuZ2VkLCA2IGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJp dmVycy9uZXQvd2lyZWxlc3MvYnJvYWRjb20vYjQzL3NkaW8uYyBiL2RyaXZlcnMvbmV0L3dpcmVs ZXNzL2Jyb2FkY29tL2I0My9zZGlvLmMKaW5kZXggODgxYTc5MzhjNDk0Li4wMmIwY2ZkNTM1YWIg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvbmV0L3dpcmVsZXNzL2Jyb2FkY29tL2I0My9zZGlvLmMKKysr IGIvZHJpdmVycy9uZXQvd2lyZWxlc3MvYnJvYWRjb20vYjQzL3NkaW8uYwpAQCAtMTgwLDggKzE4 MCw4IEBAIHN0YXRpYyB2b2lkIGI0M19zZGlvX3JlbW92ZShzdHJ1Y3Qgc2Rpb19mdW5jICpmdW5j KQogfQogCiBzdGF0aWMgY29uc3Qgc3RydWN0IHNkaW9fZGV2aWNlX2lkIGI0M19zZGlvX2lkc1td ID0gewotCXsgU0RJT19ERVZJQ0UoMHgwMmQwLCAweDA0NGIpIH0sIC8qIE5pbnRlbmRvIFdpaSBX TEFOIGRhdWdodGVyIGNhcmQgKi8KLQl7IFNESU9fREVWSUNFKDB4MDA5MiwgMHgwMDA0KSB9LCAv KiBDLWd1eXMsIEluYy4gRVctQ0cxMTAyR0MgKi8KKwl7IFNESU9fREVWSUNFKFNESU9fVkVORE9S X0lEX0JST0FEQ09NLCBTRElPX0RFVklDRV9JRF9CUk9BRENPTV9OSU5URU5ET19XSUkpIH0sCisJ eyBTRElPX0RFVklDRShTRElPX1ZFTkRPUl9JRF9DR1VZUywgU0RJT19ERVZJQ0VfSURfQ0dVWVNf RVdfQ0cxMTAyR0MpIH0sCiAJeyB9LAogfTsKIApkaWZmIC0tZ2l0IGEvaW5jbHVkZS9saW51eC9t bWMvc2Rpb19pZHMuaCBiL2luY2x1ZGUvbGludXgvbW1jL3NkaW9faWRzLmgKaW5kZXggMjg5NGY3 NzM5YWNjLi44ZTdhMDY4M2I5MjcgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUvbGludXgvbW1jL3NkaW9f aWRzLmgKKysrIGIvaW5jbHVkZS9saW51eC9tbWMvc2Rpb19pZHMuaApAQCAtMjUsNiArMjUsOSBA QAogICogVmVuZG9ycyBhbmQgZGV2aWNlcy4gIFNvcnQga2V5OiB2ZW5kb3IgZmlyc3QsIGRldmlj ZSBuZXh0LgogICovCiAKKyNkZWZpbmUgU0RJT19WRU5ET1JfSURfQ0dVWVMJCQkweDAwOTIKKyNk ZWZpbmUgU0RJT19ERVZJQ0VfSURfQ0dVWVNfRVdfQ0cxMTAyR0MJMHgwMDA0CisKICNkZWZpbmUg U0RJT19WRU5ET1JfSURfQVRIRVJPUwkJCTB4MDI3MQogI2RlZmluZSBTRElPX0RFVklDRV9JRF9B VEhFUk9TX0FSNjAwM18wMAkweDAzMDAKICNkZWZpbmUgU0RJT19ERVZJQ0VfSURfQVRIRVJPU19B UjYwMDNfMDEJMHgwMzAxCkBAIC0zNyw2ICs0MCw3IEBACiAjZGVmaW5lIFNESU9fREVWSUNFX0lE X0FUSEVST1NfUUNBOTM3NwkJMHgwNzAxCiAKICNkZWZpbmUgU0RJT19WRU5ET1JfSURfQlJPQURD T00JCQkweDAyZDAKKyNkZWZpbmUgU0RJT19ERVZJQ0VfSURfQlJPQURDT01fTklOVEVORE9fV0lJ CTB4MDQ0YgogI2RlZmluZSBTRElPX0RFVklDRV9JRF9CUk9BRENPTV80MzE0MwkJMHhhODg3CiAj ZGVmaW5lIFNESU9fREVWSUNFX0lEX0JST0FEQ09NXzQzMjQxCQkweDQzMjQKICNkZWZpbmUgU0RJ T19ERVZJQ0VfSURfQlJPQURDT01fNDMyOQkJMHg0MzI5Ci0tIAoyLjIwLjEKCgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwphdGgxMGsgbWFpbGluZyBsaXN0 CmF0aDEwa0BsaXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21h aWxtYW4vbGlzdGluZm8vYXRoMTBrCg== 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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 9642BC433DF for ; Fri, 22 May 2020 14:46:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 673EE21534 for ; Fri, 22 May 2020 14:46:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590158767; bh=9vrfLJZTL8WRQ1zupaCKPmQrLZnRZD1ZGr/IqCu0zrg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=G95KDbBj+EX9KoXF9peSYZIS6Ep+JLQp3iNjgAZUuVfaSsxwvXVJqxuOX08bSawmV fxBH7Vksh+2al7JSBNG7ZKTA3+F3GvFVbi+/wfulLbsxqVTP0yBVmesAibYpWiBR7P ZJZYUaNdEs09g+NI8aUBQgAjOgxOj1g1KjceKiiY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730409AbgEVOqG (ORCPT ); Fri, 22 May 2020 10:46:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:48604 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730357AbgEVOqF (ORCPT ); Fri, 22 May 2020 10:46:05 -0400 Received: from pali.im (pali.im [31.31.79.79]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E68F12053B; Fri, 22 May 2020 14:46:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590158765; bh=9vrfLJZTL8WRQ1zupaCKPmQrLZnRZD1ZGr/IqCu0zrg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jK2flk8kqtjnzRkud16YaMP5KNZWB2D/e0eVyzKP27T567icbolifPhI0j0G+ve+Y H6h8Xme+lxQmSFqw8laWH/FDENfb0FnxwRdGJDoqspL0SBjr8THw6h8twJq4I/UXhy XiLnCTKBOSl/T1MRltWqSS2+25W73HEc0UC85IPc= Received: by pali.im (Postfix) id 2D0B651E; Fri, 22 May 2020 16:46:03 +0200 (CEST) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Ulf Hansson , linux-mmc@vger.kernel.org Cc: Matthias Brugger , Mauro Carvalho Chehab , Kalle Valo , Amitkumar Karwar , Ganapathi Bhat , Xinming Hu , linux-kernel@vger.kernel.org, ath10k@lists.infradead.org, b43-dev@lists.infradead.org, brcm80211-dev-list.pdl@broadcom.com, brcm80211-dev-list@cypress.com, libertas-dev@lists.infradead.org, linux-wireless@vger.kernel.org, =?UTF-8?q?Marek=20Beh=C3=BAn?= Subject: [PATCH 09/11] mmc: sdio: Move SDIO IDs from b43-sdio driver to common include file Date: Fri, 22 May 2020 16:44:10 +0200 Message-Id: <20200522144412.19712-10-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200522144412.19712-1-pali@kernel.org> References: <20200522144412.19712-1-pali@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org Define appropriate macro names for consistency with other macros. Signed-off-by: Pali Rohár --- drivers/net/wireless/broadcom/b43/sdio.c | 4 ++-- include/linux/mmc/sdio_ids.h | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/broadcom/b43/sdio.c b/drivers/net/wireless/broadcom/b43/sdio.c index 881a7938c494..02b0cfd535ab 100644 --- a/drivers/net/wireless/broadcom/b43/sdio.c +++ b/drivers/net/wireless/broadcom/b43/sdio.c @@ -180,8 +180,8 @@ static void b43_sdio_remove(struct sdio_func *func) } static const struct sdio_device_id b43_sdio_ids[] = { - { SDIO_DEVICE(0x02d0, 0x044b) }, /* Nintendo Wii WLAN daughter card */ - { SDIO_DEVICE(0x0092, 0x0004) }, /* C-guys, Inc. EW-CG1102GC */ + { SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_NINTENDO_WII) }, + { SDIO_DEVICE(SDIO_VENDOR_ID_CGUYS, SDIO_DEVICE_ID_CGUYS_EW_CG1102GC) }, { }, }; diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h index 2894f7739acc..8e7a0683b927 100644 --- a/include/linux/mmc/sdio_ids.h +++ b/include/linux/mmc/sdio_ids.h @@ -25,6 +25,9 @@ * Vendors and devices. Sort key: vendor first, device next. */ +#define SDIO_VENDOR_ID_CGUYS 0x0092 +#define SDIO_DEVICE_ID_CGUYS_EW_CG1102GC 0x0004 + #define SDIO_VENDOR_ID_ATHEROS 0x0271 #define SDIO_DEVICE_ID_ATHEROS_AR6003_00 0x0300 #define SDIO_DEVICE_ID_ATHEROS_AR6003_01 0x0301 @@ -37,6 +40,7 @@ #define SDIO_DEVICE_ID_ATHEROS_QCA9377 0x0701 #define SDIO_VENDOR_ID_BROADCOM 0x02d0 +#define SDIO_DEVICE_ID_BROADCOM_NINTENDO_WII 0x044b #define SDIO_DEVICE_ID_BROADCOM_43143 0xa887 #define SDIO_DEVICE_ID_BROADCOM_43241 0x4324 #define SDIO_DEVICE_ID_BROADCOM_4329 0x4329 -- 2.20.1