All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Pali Rohár" <pali@kernel.org>
To: Ulf Hansson <ulf.hansson@linaro.org>, linux-mmc@vger.kernel.org
Cc: "Matthias Brugger" <matthias.bgg@gmail.com>,
	"Mauro Carvalho Chehab" <mchehab@kernel.org>,
	"Kalle Valo" <kvalo@codeaurora.org>,
	"Amitkumar Karwar" <amitkarwar@gmail.com>,
	"Ganapathi Bhat" <ganapathi.bhat@nxp.com>,
	"Xinming Hu" <huxinming820@gmail.com>,
	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,
	"Marek Behún" <marek.behun@nic.cz>
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	[thread overview]
Message-ID: <20200522144412.19712-10-pali@kernel.org> (raw)
In-Reply-To: <20200522144412.19712-1-pali@kernel.org>

Define appropriate macro names for consistency with other macros.

Signed-off-by: Pali Rohár <pali@kernel.org>
---
 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


WARNING: multiple messages have this Message-ID (diff)
From: "Pali Rohár" <pali@kernel.org>
To: Ulf Hansson <ulf.hansson@linaro.org>, linux-mmc@vger.kernel.org
Cc: brcm80211-dev-list.pdl@broadcom.com,
	libertas-dev@lists.infradead.org,
	"Xinming Hu" <huxinming820@gmail.com>,
	linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org,
	"Amitkumar Karwar" <amitkarwar@gmail.com>,
	"Marek Behún" <marek.behun@nic.cz>,
	"Ganapathi Bhat" <ganapathi.bhat@nxp.com>,
	ath10k@lists.infradead.org,
	"Matthias Brugger" <matthias.bgg@gmail.com>,
	"Mauro Carvalho Chehab" <mchehab@kernel.org>,
	brcm80211-dev-list@cypress.com,
	"Kalle Valo" <kvalo@codeaurora.org>,
	b43-dev@lists.infradead.org
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	[thread overview]
Message-ID: <20200522144412.19712-10-pali@kernel.org> (raw)
In-Reply-To: <20200522144412.19712-1-pali@kernel.org>

Define appropriate macro names for consistency with other macros.

Signed-off-by: Pali Rohár <pali@kernel.org>
---
 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


_______________________________________________
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k

  parent reply	other threads:[~2020-05-22 14:46 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-22 14:44 [PATCH 00/11] mmc: sdio: Move SDIO IDs from drivers to common include file Pali Rohár
2020-05-22 14:44 ` Pali Rohár
2020-05-22 14:44 ` [PATCH 01/11] mmc: sdio: Fix macro name for Marvell device with ID 0x9134 Pali Rohár
2020-05-22 14:44   ` Pali Rohár
2020-05-29  3:28   ` [EXT] " Ganapathi Bhat
2020-05-29  3:28     ` Ganapathi Bhat
2020-05-22 14:44 ` [PATCH 02/11] mmc: sdio: Change macro names for Marvell 8688 modules Pali Rohár
2020-05-22 14:44   ` Pali Rohár
2020-05-28 12:32   ` [EXT] " Ganapathi Bhat
2020-05-28 12:32     ` Ganapathi Bhat
2020-05-22 14:44 ` [PATCH 03/11] mmc: sdio: Move SDIO IDs from mwifiex driver to common include file Pali Rohár
2020-05-22 14:44   ` Pali Rohár
2020-05-25 10:38   ` Kalle Valo
2020-05-25 10:38     ` Kalle Valo
2020-05-28 12:29   ` [EXT] " Ganapathi Bhat
2020-05-28 12:29     ` Ganapathi Bhat
2020-05-22 14:44 ` [PATCH 04/11] mmc: sdio: Move SDIO IDs from btmrvl " Pali Rohár
2020-05-22 14:44   ` Pali Rohár
2020-05-28 12:27   ` [EXT] " Ganapathi Bhat
2020-05-28 12:27     ` Ganapathi Bhat
2020-05-22 14:44 ` [PATCH 05/11] mmc: sdio: Move SDIO IDs from btmtksdio " Pali Rohár
2020-05-22 14:44   ` Pali Rohár
2020-05-22 15:02   ` Matthias Brugger
2020-05-22 15:02     ` Matthias Brugger
2020-05-22 14:44 ` [PATCH 06/11] mmc: sdio: Move SDIO IDs from smssdio " Pali Rohár
2020-05-22 14:44   ` Pali Rohár
2020-05-22 14:44 ` [PATCH 07/11] mmc: sdio: Move SDIO IDs from ath6kl " Pali Rohár
2020-05-22 14:44   ` Pali Rohár
2020-05-25 10:38   ` Kalle Valo
2020-05-25 10:38     ` Kalle Valo
2020-05-22 14:44 ` [PATCH 08/11] mmc: sdio: Move SDIO IDs from ath10k " Pali Rohár
2020-05-22 14:44   ` Pali Rohár
2020-05-22 14:44 ` Pali Rohár [this message]
2020-05-22 14:44   ` [PATCH 09/11] mmc: sdio: Move SDIO IDs from b43-sdio " Pali Rohár
2020-05-22 14:44 ` [PATCH 10/11] mmc: sdio: Fix Cypress SDIO IDs macros in " Pali Rohár
2020-05-22 14:44   ` Pali Rohár
2020-05-22 14:44 ` [PATCH 11/11] mmc: sdio: Sort all SDIO IDs " Pali Rohár
2020-05-22 14:44   ` Pali Rohár
2020-05-25  7:15 ` [PATCH 00/11] mmc: sdio: Move SDIO IDs from drivers to " Ulf Hansson
2020-05-25  7:15   ` Ulf Hansson
2020-05-28 10:13   ` Ulf Hansson
2020-05-28 10:13     ` Ulf Hansson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200522144412.19712-10-pali@kernel.org \
    --to=pali@kernel.org \
    --cc=amitkarwar@gmail.com \
    --cc=ath10k@lists.infradead.org \
    --cc=b43-dev@lists.infradead.org \
    --cc=brcm80211-dev-list.pdl@broadcom.com \
    --cc=brcm80211-dev-list@cypress.com \
    --cc=ganapathi.bhat@nxp.com \
    --cc=huxinming820@gmail.com \
    --cc=kvalo@codeaurora.org \
    --cc=libertas-dev@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mmc@vger.kernel.org \
    --cc=linux-wireless@vger.kernel.org \
    --cc=marek.behun@nic.cz \
    --cc=matthias.bgg@gmail.com \
    --cc=mchehab@kernel.org \
    --cc=ulf.hansson@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.