diff mbox series

wilc1000: Move wilc1000 SDIO ID's from driver source to common header file

Message ID 20200717051134.19160-1-ajay.kathat@microchip.com (mailing list archive)
State Accepted
Commit c83e2a6e2fbbb7d47ea46fd7cb1f01292f2d0b6e
Delegated to: Kalle Valo
Headers show
Series wilc1000: Move wilc1000 SDIO ID's from driver source to common header file | expand

Commit Message

Ajay Singh July 17, 2020, 5:11 a.m. UTC 
From: Ajay Singh <ajay.kathat@microchip.com>

Moved macros used for Vendor/Device ID from wilc1000 driver to common
header file and changed macro name for consistency with other macros.

Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
---
 drivers/net/wireless/microchip/wilc1000/sdio.c | 6 ++----
 include/linux/mmc/sdio_ids.h                   | 3 +++
 2 files changed, 5 insertions(+), 4 deletions(-)

Comments

Ulf Hansson July 18, 2020, 9:28 a.m. UTC | #1 
On Fri, 17 Jul 2020 at 07:11, <Ajay.Kathat@microchip.com> wrote:
>
> From: Ajay Singh <ajay.kathat@microchip.com>
>
> Moved macros used for Vendor/Device ID from wilc1000 driver to common
> header file and changed macro name for consistency with other macros.
>
> Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>

Acked-by: Ulf Hansson <ulf.hansson@linaro.org>

Kind regards
Uffe

> ---
>  drivers/net/wireless/microchip/wilc1000/sdio.c | 6 ++----
>  include/linux/mmc/sdio_ids.h                   | 3 +++
>  2 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/wireless/microchip/wilc1000/sdio.c b/drivers/net/wireless/microchip/wilc1000/sdio.c
> index 36eb589263bf..3ece7b0b0392 100644
> --- a/drivers/net/wireless/microchip/wilc1000/sdio.c
> +++ b/drivers/net/wireless/microchip/wilc1000/sdio.c
> @@ -6,6 +6,7 @@
>
>  #include <linux/clk.h>
>  #include <linux/mmc/sdio_func.h>
> +#include <linux/mmc/sdio_ids.h>
>  #include <linux/mmc/host.h>
>  #include <linux/mmc/sdio.h>
>  #include <linux/of_irq.h>
> @@ -15,11 +16,8 @@
>
>  #define SDIO_MODALIAS "wilc1000_sdio"
>
> -#define SDIO_VENDOR_ID_WILC 0x0296
> -#define SDIO_DEVICE_ID_WILC 0x5347
> -
>  static const struct sdio_device_id wilc_sdio_ids[] = {
> -       { SDIO_DEVICE(SDIO_VENDOR_ID_WILC, SDIO_DEVICE_ID_WILC) },
> +       { SDIO_DEVICE(SDIO_VENDOR_ID_MICROCHIP_WILC, SDIO_DEVICE_ID_MICROCHIP_WILC1000) },
>         { },
>  };
>
> diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h
> index 15ed8ce9d394..519820d18e62 100644
> --- a/include/linux/mmc/sdio_ids.h
> +++ b/include/linux/mmc/sdio_ids.h
> @@ -105,6 +105,9 @@
>  #define SDIO_DEVICE_ID_MEDIATEK_MT7663         0x7663
>  #define SDIO_DEVICE_ID_MEDIATEK_MT7668         0x7668
>
> +#define SDIO_VENDOR_ID_MICROCHIP_WILC          0x0296
> +#define SDIO_DEVICE_ID_MICROCHIP_WILC1000      0x5347
> +
>  #define SDIO_VENDOR_ID_SIANO                   0x039a
>  #define SDIO_DEVICE_ID_SIANO_NOVA_B0           0x0201
>  #define SDIO_DEVICE_ID_SIANO_NICE              0x0202
> --
> 2.24.0
Pali Rohár July 20, 2020, 7:31 a.m. UTC | #2 
On Friday 17 July 2020 05:11:38 Ajay.Kathat@microchip.com wrote:
> From: Ajay Singh <ajay.kathat@microchip.com>
> 
> Moved macros used for Vendor/Device ID from wilc1000 driver to common
> header file and changed macro name for consistency with other macros.
> 
> Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>

Acked-by: Pali Rohár <pali@kernel.org>

> ---
>  drivers/net/wireless/microchip/wilc1000/sdio.c | 6 ++----
>  include/linux/mmc/sdio_ids.h                   | 3 +++
>  2 files changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/net/wireless/microchip/wilc1000/sdio.c b/drivers/net/wireless/microchip/wilc1000/sdio.c
> index 36eb589263bf..3ece7b0b0392 100644
> --- a/drivers/net/wireless/microchip/wilc1000/sdio.c
> +++ b/drivers/net/wireless/microchip/wilc1000/sdio.c
> @@ -6,6 +6,7 @@
>  
>  #include <linux/clk.h>
>  #include <linux/mmc/sdio_func.h>
> +#include <linux/mmc/sdio_ids.h>
>  #include <linux/mmc/host.h>
>  #include <linux/mmc/sdio.h>
>  #include <linux/of_irq.h>
> @@ -15,11 +16,8 @@
>  
>  #define SDIO_MODALIAS "wilc1000_sdio"
>  
> -#define SDIO_VENDOR_ID_WILC 0x0296
> -#define SDIO_DEVICE_ID_WILC 0x5347
> -
>  static const struct sdio_device_id wilc_sdio_ids[] = {
> -	{ SDIO_DEVICE(SDIO_VENDOR_ID_WILC, SDIO_DEVICE_ID_WILC) },
> +	{ SDIO_DEVICE(SDIO_VENDOR_ID_MICROCHIP_WILC, SDIO_DEVICE_ID_MICROCHIP_WILC1000) },
>  	{ },
>  };
>  
> diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h
> index 15ed8ce9d394..519820d18e62 100644
> --- a/include/linux/mmc/sdio_ids.h
> +++ b/include/linux/mmc/sdio_ids.h
> @@ -105,6 +105,9 @@
>  #define SDIO_DEVICE_ID_MEDIATEK_MT7663		0x7663
>  #define SDIO_DEVICE_ID_MEDIATEK_MT7668		0x7668
>  
> +#define SDIO_VENDOR_ID_MICROCHIP_WILC		0x0296
> +#define SDIO_DEVICE_ID_MICROCHIP_WILC1000	0x5347
> +
>  #define SDIO_VENDOR_ID_SIANO			0x039a
>  #define SDIO_DEVICE_ID_SIANO_NOVA_B0		0x0201
>  #define SDIO_DEVICE_ID_SIANO_NICE		0x0202
> -- 
> 2.24.0
Kalle Valo July 20, 2020, 9:49 a.m. UTC | #3 
Ulf Hansson <ulf.hansson@linaro.org> writes:

> On Fri, 17 Jul 2020 at 07:11, <Ajay.Kathat@microchip.com> wrote:
>>
>> From: Ajay Singh <ajay.kathat@microchip.com>
>>
>> Moved macros used for Vendor/Device ID from wilc1000 driver to common
>> header file and changed macro name for consistency with other macros.
>>
>> Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
>
> Acked-by: Ulf Hansson <ulf.hansson@linaro.org>

Just so that I have understood correctly, so the plan is to take this
via wireless-drivers-next?
Kalle Valo Aug. 2, 2020, 3:12 p.m. UTC | #4 
<Ajay.Kathat@microchip.com> wrote:

> From: Ajay Singh <ajay.kathat@microchip.com>
> 
> Moved macros used for Vendor/Device ID from wilc1000 driver to common
> header file and changed macro name for consistency with other macros.
> 
> Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
> Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
> Acked-by: Pali Rohár <pali@kernel.org>

Patch applied to wireless-drivers-next.git, thanks.

c83e2a6e2fbb wilc1000: Move wilc1000 SDIO ID's from driver source to common header file
diff mbox series

Patch

diff --git a/drivers/net/wireless/microchip/wilc1000/sdio.c b/drivers/net/wireless/microchip/wilc1000/sdio.c
index 36eb589263bf..3ece7b0b0392 100644
--- a/drivers/net/wireless/microchip/wilc1000/sdio.c
+++ b/drivers/net/wireless/microchip/wilc1000/sdio.c
@@ -6,6 +6,7 @@ 
 
 #include <linux/clk.h>
 #include <linux/mmc/sdio_func.h>
+#include <linux/mmc/sdio_ids.h>
 #include <linux/mmc/host.h>
 #include <linux/mmc/sdio.h>
 #include <linux/of_irq.h>
@@ -15,11 +16,8 @@ 
 
 #define SDIO_MODALIAS "wilc1000_sdio"
 
-#define SDIO_VENDOR_ID_WILC 0x0296
-#define SDIO_DEVICE_ID_WILC 0x5347
-
 static const struct sdio_device_id wilc_sdio_ids[] = {
-	{ SDIO_DEVICE(SDIO_VENDOR_ID_WILC, SDIO_DEVICE_ID_WILC) },
+	{ SDIO_DEVICE(SDIO_VENDOR_ID_MICROCHIP_WILC, SDIO_DEVICE_ID_MICROCHIP_WILC1000) },
 	{ },
 };
 
diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h
index 15ed8ce9d394..519820d18e62 100644
--- a/include/linux/mmc/sdio_ids.h
+++ b/include/linux/mmc/sdio_ids.h
@@ -105,6 +105,9 @@ 
 #define SDIO_DEVICE_ID_MEDIATEK_MT7663		0x7663
 #define SDIO_DEVICE_ID_MEDIATEK_MT7668		0x7668
 
+#define SDIO_VENDOR_ID_MICROCHIP_WILC		0x0296
+#define SDIO_DEVICE_ID_MICROCHIP_WILC1000	0x5347
+
 #define SDIO_VENDOR_ID_SIANO			0x039a
 #define SDIO_DEVICE_ID_SIANO_NOVA_B0		0x0201
 #define SDIO_DEVICE_ID_SIANO_NICE		0x0202