| Message ID | 20200629072144.24351-1-pali@kernel.org (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | mmc: sdio: Move SDIO IDs from rsi_sdio driver to common include file | expand |
On Mon, 29 Jun 2020 at 09:22, Pali Rohár <pali@kernel.org> wrote: > > Define appropriate macro names for consistency with other macros. > > Signed-off-by: Pali Rohár <pali@kernel.org> Applied for next, thanks! If it turns out that it's a better idea to funnel this via Kale's wireless tree, then I can drop it - and you may consider this as an ack instead. Kind regards Uffe > --- > Hello Ulf! I forgot to include change for rsi driver into patch series: > "mmc: sdio: Move SDIO IDs from drivers to common include file" > https://lore.kernel.org/linux-mmc/20200522144412.19712-1-pali@kernel.org/ > As patch series was already merged, I'm sending this patch separately. > --- > drivers/net/wireless/rsi/rsi_91x_sdio.c | 8 ++++---- > drivers/net/wireless/rsi/rsi_sdio.h | 4 ---- > include/linux/mmc/sdio_ids.h | 4 ++++ > 3 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/drivers/net/wireless/rsi/rsi_91x_sdio.c b/drivers/net/wireless/rsi/rsi_91x_sdio.c > index 5d6143a55187..a04ff75c409f 100644 > --- a/drivers/net/wireless/rsi/rsi_91x_sdio.c > +++ b/drivers/net/wireless/rsi/rsi_91x_sdio.c > @@ -1038,10 +1038,10 @@ static int rsi_probe(struct sdio_func *pfunction, > goto fail_free_adapter; > } > > - if (pfunction->device == RSI_SDIO_PID_9113) { > + if (pfunction->device == SDIO_DEVICE_ID_RSI_9113) { > rsi_dbg(ERR_ZONE, "%s: 9113 module detected\n", __func__); > adapter->device_model = RSI_DEV_9113; > - } else if (pfunction->device == RSI_SDIO_PID_9116) { > + } else if (pfunction->device == SDIO_DEVICE_ID_RSI_9116) { > rsi_dbg(ERR_ZONE, "%s: 9116 module detected\n", __func__); > adapter->device_model = RSI_DEV_9116; > } else { > @@ -1526,8 +1526,8 @@ static const struct dev_pm_ops rsi_pm_ops = { > #endif > > static const struct sdio_device_id rsi_dev_table[] = { > - { SDIO_DEVICE(RSI_SDIO_VENDOR_ID, RSI_SDIO_PID_9113) }, > - { SDIO_DEVICE(RSI_SDIO_VENDOR_ID, RSI_SDIO_PID_9116) }, > + { SDIO_DEVICE(SDIO_VENDOR_ID_RSI, SDIO_DEVICE_ID_RSI_9113) }, > + { SDIO_DEVICE(SDIO_VENDOR_ID_RSI, SDIO_DEVICE_ID_RSI_9116) }, > { /* Blank */}, > }; > > diff --git a/drivers/net/wireless/rsi/rsi_sdio.h b/drivers/net/wireless/rsi/rsi_sdio.h > index c5cfb6238f73..9afc1d0d2684 100644 > --- a/drivers/net/wireless/rsi/rsi_sdio.h > +++ b/drivers/net/wireless/rsi/rsi_sdio.h > @@ -28,10 +28,6 @@ > #include <linux/mmc/sdio_ids.h> > #include "rsi_main.h" > > -#define RSI_SDIO_VENDOR_ID 0x041B > -#define RSI_SDIO_PID_9113 0x9330 > -#define RSI_SDIO_PID_9116 0x9116 > - > enum sdio_interrupt_type { > BUFFER_FULL = 0x0, > BUFFER_AVAILABLE = 0x2, > diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h > index 15ed8ce9d394..ab41801c5f51 100644 > --- a/include/linux/mmc/sdio_ids.h > +++ b/include/linux/mmc/sdio_ids.h > @@ -118,6 +118,10 @@ > #define SDIO_DEVICE_ID_SIANO_NOVA_A0 0x1100 > #define SDIO_DEVICE_ID_SIANO_STELLAR 0x5347 > > +#define SDIO_VENDOR_ID_RSI 0x041b > +#define SDIO_DEVICE_ID_RSI_9113 0x9330 > +#define SDIO_DEVICE_ID_RSI_9116 0x9116 > + > #define SDIO_VENDOR_ID_TI_WL1251 0x104c > #define SDIO_DEVICE_ID_TI_WL1251 0x9066 > > -- > 2.20.1 >
Ulf Hansson <ulf.hansson@linaro.org> writes: > On Mon, 29 Jun 2020 at 09:22, Pali Rohár <pali@kernel.org> wrote: >> >> Define appropriate macro names for consistency with other macros. >> >> Signed-off-by: Pali Rohár <pali@kernel.org> > > Applied for next, thanks! > > If it turns out that it's a better idea to funnel this via Kale's > wireless tree, then I can drop it - and you may consider this as an > ack instead. I'm not expecting any conflicts with this so going via mmc tree is fine with me. Acked-by: Kalle Valo <kvalo@codeaurora.org>
diff --git a/drivers/net/wireless/rsi/rsi_91x_sdio.c b/drivers/net/wireless/rsi/rsi_91x_sdio.c index 5d6143a55187..a04ff75c409f 100644 --- a/drivers/net/wireless/rsi/rsi_91x_sdio.c +++ b/drivers/net/wireless/rsi/rsi_91x_sdio.c @@ -1038,10 +1038,10 @@ static int rsi_probe(struct sdio_func *pfunction, goto fail_free_adapter; } - if (pfunction->device == RSI_SDIO_PID_9113) { + if (pfunction->device == SDIO_DEVICE_ID_RSI_9113) { rsi_dbg(ERR_ZONE, "%s: 9113 module detected\n", __func__); adapter->device_model = RSI_DEV_9113; - } else if (pfunction->device == RSI_SDIO_PID_9116) { + } else if (pfunction->device == SDIO_DEVICE_ID_RSI_9116) { rsi_dbg(ERR_ZONE, "%s: 9116 module detected\n", __func__); adapter->device_model = RSI_DEV_9116; } else { @@ -1526,8 +1526,8 @@ static const struct dev_pm_ops rsi_pm_ops = { #endif static const struct sdio_device_id rsi_dev_table[] = { - { SDIO_DEVICE(RSI_SDIO_VENDOR_ID, RSI_SDIO_PID_9113) }, - { SDIO_DEVICE(RSI_SDIO_VENDOR_ID, RSI_SDIO_PID_9116) }, + { SDIO_DEVICE(SDIO_VENDOR_ID_RSI, SDIO_DEVICE_ID_RSI_9113) }, + { SDIO_DEVICE(SDIO_VENDOR_ID_RSI, SDIO_DEVICE_ID_RSI_9116) }, { /* Blank */}, }; diff --git a/drivers/net/wireless/rsi/rsi_sdio.h b/drivers/net/wireless/rsi/rsi_sdio.h index c5cfb6238f73..9afc1d0d2684 100644 --- a/drivers/net/wireless/rsi/rsi_sdio.h +++ b/drivers/net/wireless/rsi/rsi_sdio.h @@ -28,10 +28,6 @@ #include <linux/mmc/sdio_ids.h> #include "rsi_main.h" -#define RSI_SDIO_VENDOR_ID 0x041B -#define RSI_SDIO_PID_9113 0x9330 -#define RSI_SDIO_PID_9116 0x9116 - enum sdio_interrupt_type { BUFFER_FULL = 0x0, BUFFER_AVAILABLE = 0x2, diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h index 15ed8ce9d394..ab41801c5f51 100644 --- a/include/linux/mmc/sdio_ids.h +++ b/include/linux/mmc/sdio_ids.h @@ -118,6 +118,10 @@ #define SDIO_DEVICE_ID_SIANO_NOVA_A0 0x1100 #define SDIO_DEVICE_ID_SIANO_STELLAR 0x5347 +#define SDIO_VENDOR_ID_RSI 0x041b +#define SDIO_DEVICE_ID_RSI_9113 0x9330 +#define SDIO_DEVICE_ID_RSI_9116 0x9116 + #define SDIO_VENDOR_ID_TI_WL1251 0x104c #define SDIO_DEVICE_ID_TI_WL1251 0x9066
Define appropriate macro names for consistency with other macros. Signed-off-by: Pali Rohár <pali@kernel.org> --- Hello Ulf! I forgot to include change for rsi driver into patch series: "mmc: sdio: Move SDIO IDs from drivers to common include file" https://lore.kernel.org/linux-mmc/20200522144412.19712-1-pali@kernel.org/ As patch series was already merged, I'm sending this patch separately. --- drivers/net/wireless/rsi/rsi_91x_sdio.c | 8 ++++---- drivers/net/wireless/rsi/rsi_sdio.h | 4 ---- include/linux/mmc/sdio_ids.h | 4 ++++ 3 files changed, 8 insertions(+), 8 deletions(-)