1. add intel's sdio vendor id to sdio_ids.h
2. move iwmc3200 sdio devices ids to sdio_ids.h
This patch is against 2.6.31-rc2
7638d5322bd89d49e013a03fe2afaeb6d214fabd
Cc:[email protected]
Cc:[email protected]
Cc:[email protected]
Cc:[email protected]
Cc:[email protected]
Signed-off-by: Tomas Winkler <[email protected]>
---
drivers/net/wimax/i2400m/sdio.c | 10 ++++------
drivers/net/wireless/iwmc3200wifi/sdio.c | 4 +++-
drivers/net/wireless/iwmc3200wifi/sdio.h | 3 ---
include/linux/mmc/sdio_ids.h | 5 +++++
4 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/drivers/net/wimax/i2400m/sdio.c b/drivers/net/wimax/i2400m/sdio.c
index 2538825..3dc1990 100644
--- a/drivers/net/wimax/i2400m/sdio.c
+++ b/drivers/net/wimax/i2400m/sdio.c
@@ -58,6 +58,7 @@
*/
#include <linux/debugfs.h>
+#include <linux/mmc/sdio_ids.h>
#include <linux/mmc/sdio.h>
#include <linux/mmc/sdio_func.h>
#include "i2400m-sdio.h"
@@ -501,14 +502,11 @@ void i2400ms_remove(struct sdio_func *func)
d_fnend(3, dev, "SDIO func %p\n", func);
}
-enum {
- I2400MS_INTEL_VID = 0x89,
-};
-
static
const struct sdio_device_id i2400ms_sdio_ids[] = {
- /* Intel: i2400m WiMAX over SDIO */
- { SDIO_DEVICE(I2400MS_INTEL_VID, 0x1402) },
+ /* Intel: i2400m WiMAX (iwm3200) over SDIO */
+ { SDIO_DEVICE(SDIO_VENDOR_ID_INTEL,
+ SDIO_DEVICE_ID_INTEL_IWMC3200WIMAX) },
{ }, /* end: all zeroes */
};
MODULE_DEVICE_TABLE(sdio, i2400ms_sdio_ids);
diff --git a/drivers/net/wireless/iwmc3200wifi/sdio.c b/drivers/net/wireless/iwmc3200wifi/sdio.c
index 9166818..995a3f6 100644
--- a/drivers/net/wireless/iwmc3200wifi/sdio.c
+++ b/drivers/net/wireless/iwmc3200wifi/sdio.c
@@ -65,6 +65,7 @@
#include <linux/kernel.h>
#include <linux/netdevice.h>
#include <linux/debugfs.h>
+#include <linux/mmc/sdio_ids.h>
#include <linux/mmc/sdio.h>
#include <linux/mmc/sdio_func.h>
@@ -492,7 +493,8 @@ static void iwm_sdio_remove(struct sdio_func *func)
}
static const struct sdio_device_id iwm_sdio_ids[] = {
- { SDIO_DEVICE(SDIO_VENDOR_ID_INTEL, SDIO_DEVICE_ID_IWM) },
+ { SDIO_DEVICE(SDIO_VENDOR_ID_INTEL,
+ SDIO_DEVICE_ID_INTEL_IWMC3200WIFI) },
{ /* end: all zeroes */ },
};
MODULE_DEVICE_TABLE(sdio, iwm_sdio_ids);
diff --git a/drivers/net/wireless/iwmc3200wifi/sdio.h b/drivers/net/wireless/iwmc3200wifi/sdio.h
index b3c156b..aab6b68 100644
--- a/drivers/net/wireless/iwmc3200wifi/sdio.h
+++ b/drivers/net/wireless/iwmc3200wifi/sdio.h
@@ -39,9 +39,6 @@
#ifndef __IWM_SDIO_H__
#define __IWM_SDIO_H__
-#define SDIO_VENDOR_ID_INTEL 0x89
-#define SDIO_DEVICE_ID_IWM 0x1403
-
#define IWM_SDIO_DATA_ADDR 0x0
#define IWM_SDIO_INTR_ENABLE_ADDR 0x14
#define IWM_SDIO_INTR_STATUS_ADDR 0x13
diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h
index 39751c8..b46a57a 100644
--- a/include/linux/mmc/sdio_ids.h
+++ b/include/linux/mmc/sdio_ids.h
@@ -22,6 +22,11 @@
/*
* Vendors and devices. Sort key: vendor first, device next.
*/
+#define SDIO_VENDOR_ID_INTEL 0x0089
+#define SDIO_DEVICE_ID_INTEL_IWMC3200WIMAX 0x1402
+#define SDIO_DEVICE_ID_INTEL_IWMC3200WIFI 0x1403
+#define SDIO_DEVICE_ID_INTEL_IWMC3200TOP 0x1404
+#define SDIO_DEVICE_ID_INTEL_IWMC3200BT 0x1406
#define SDIO_VENDOR_ID_MARVELL 0x02df
#define SDIO_DEVICE_ID_MARVELL_LIBERTAS 0x9103
--
1.6.0.6
---------------------------------------------------------------------
Intel Israel (74) Limited
This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.
Tomas wrote:
> +#define SDIO_VENDOR_ID_INTEL 0x0089
> +#define SDIO_DEVICE_ID_INTEL_IWMC3200WIMAX 0x1402
> +#define SDIO_DEVICE_ID_INTEL_IWMC3200WIFI 0x1403
> +#define SDIO_DEVICE_ID_INTEL_IWMC3200TOP 0x1404
Looks good. Please replace the above spaces with a TAB.
> +#define SDIO_DEVICE_ID_INTEL_IWMC3200BT 0x1406
>
> #define SDIO_VENDOR_ID_MARVELL 0x02df
> #define SDIO_DEVICE_ID_MARVELL_LIBERTAS 0x9103
Thanks,
-yi
From: Tomas Winkler <[email protected]>
Date: Tue, 14 Jul 2009 01:09:13 +0300
> 1. add intel's sdio vendor id to sdio_ids.h
> 2. move iwmc3200 sdio devices ids to sdio_ids.h
>
> This patch is against 2.6.31-rc2
> 7638d5322bd89d49e013a03fe2afaeb6d214fabd
>
> Cc:[email protected]
> Cc:[email protected]
> Cc:[email protected]
> Cc:[email protected]
> Cc:[email protected]
> Signed-off-by: Tomas Winkler <[email protected]>
Since wimax stuff goes directly through me and John Linville handles
wireless things, you're making this overly difficult by combining
changes for those two subsystems into a single patch.
Please split this up, thanks.
Hi Tomas,
> 1. add intel's sdio vendor id to sdio_ids.h
> 2. move iwmc3200 sdio devices ids to sdio_ids.h
this needs a better commit message since you are touching three
subsystems right now.
Please explain what you are doing. Sounds maybe too obvious, but it is
important that we have clear commit message. Especially when it is
touching more than one subsystem and people have to resolve merge
conflicts.
> This patch is against 2.6.31-rc2
> 7638d5322bd89d49e013a03fe2afaeb6d214fabd
This should not be part of the commit message.
> Cc:[email protected]
> Cc:[email protected]
> Cc:[email protected]
> Cc:[email protected]
> Cc:[email protected]
> Signed-off-by: Tomas Winkler <[email protected]>
> ---
> drivers/net/wimax/i2400m/sdio.c | 10 ++++------
> drivers/net/wireless/iwmc3200wifi/sdio.c | 4 +++-
> drivers/net/wireless/iwmc3200wifi/sdio.h | 3 ---
> include/linux/mmc/sdio_ids.h | 5 +++++
> 4 files changed, 12 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/net/wimax/i2400m/sdio.c b/drivers/net/wimax/i2400m/sdio.c
> index 2538825..3dc1990 100644
> --- a/drivers/net/wimax/i2400m/sdio.c
> +++ b/drivers/net/wimax/i2400m/sdio.c
> @@ -58,6 +58,7 @@
> */
>
> #include <linux/debugfs.h>
> +#include <linux/mmc/sdio_ids.h>
> #include <linux/mmc/sdio.h>
> #include <linux/mmc/sdio_func.h>
> #include "i2400m-sdio.h"
> @@ -501,14 +502,11 @@ void i2400ms_remove(struct sdio_func *func)
> d_fnend(3, dev, "SDIO func %p\n", func);
> }
>
> -enum {
> - I2400MS_INTEL_VID = 0x89,
> -};
> -
> static
> const struct sdio_device_id i2400ms_sdio_ids[] = {
> - /* Intel: i2400m WiMAX over SDIO */
> - { SDIO_DEVICE(I2400MS_INTEL_VID, 0x1402) },
> + /* Intel: i2400m WiMAX (iwm3200) over SDIO */
> + { SDIO_DEVICE(SDIO_VENDOR_ID_INTEL,
> + SDIO_DEVICE_ID_INTEL_IWMC3200WIMAX) },
> { }, /* end: all zeroes */
for readability, please indent the SDIO_DEVICE_ID_INTEL...
Otherwise you easily assume you have two SDIO_DEVICE() statement.
> };
> MODULE_DEVICE_TABLE(sdio, i2400ms_sdio_ids);
> diff --git a/drivers/net/wireless/iwmc3200wifi/sdio.c b/drivers/net/wireless/iwmc3200wifi/sdio.c
> index 9166818..995a3f6 100644
> --- a/drivers/net/wireless/iwmc3200wifi/sdio.c
> +++ b/drivers/net/wireless/iwmc3200wifi/sdio.c
> @@ -65,6 +65,7 @@
> #include <linux/kernel.h>
> #include <linux/netdevice.h>
> #include <linux/debugfs.h>
> +#include <linux/mmc/sdio_ids.h>
> #include <linux/mmc/sdio.h>
> #include <linux/mmc/sdio_func.h>
>
> @@ -492,7 +493,8 @@ static void iwm_sdio_remove(struct sdio_func *func)
> }
>
> static const struct sdio_device_id iwm_sdio_ids[] = {
> - { SDIO_DEVICE(SDIO_VENDOR_ID_INTEL, SDIO_DEVICE_ID_IWM) },
> + { SDIO_DEVICE(SDIO_VENDOR_ID_INTEL,
> + SDIO_DEVICE_ID_INTEL_IWMC3200WIFI) },
> { /* end: all zeroes */ },
Same here.
> };
> MODULE_DEVICE_TABLE(sdio, iwm_sdio_ids);
> diff --git a/drivers/net/wireless/iwmc3200wifi/sdio.h b/drivers/net/wireless/iwmc3200wifi/sdio.h
> index b3c156b..aab6b68 100644
> --- a/drivers/net/wireless/iwmc3200wifi/sdio.h
> +++ b/drivers/net/wireless/iwmc3200wifi/sdio.h
> @@ -39,9 +39,6 @@
> #ifndef __IWM_SDIO_H__
> #define __IWM_SDIO_H__
>
> -#define SDIO_VENDOR_ID_INTEL 0x89
> -#define SDIO_DEVICE_ID_IWM 0x1403
> -
> #define IWM_SDIO_DATA_ADDR 0x0
> #define IWM_SDIO_INTR_ENABLE_ADDR 0x14
> #define IWM_SDIO_INTR_STATUS_ADDR 0x13
> diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h
> index 39751c8..b46a57a 100644
> --- a/include/linux/mmc/sdio_ids.h
> +++ b/include/linux/mmc/sdio_ids.h
> @@ -22,6 +22,11 @@
> /*
> * Vendors and devices. Sort key: vendor first, device next.
> */
> +#define SDIO_VENDOR_ID_INTEL 0x0089
> +#define SDIO_DEVICE_ID_INTEL_IWMC3200WIMAX 0x1402
> +#define SDIO_DEVICE_ID_INTEL_IWMC3200WIFI 0x1403
> +#define SDIO_DEVICE_ID_INTEL_IWMC3200TOP 0x1404
> +#define SDIO_DEVICE_ID_INTEL_IWMC3200BT 0x1406
While you are touching files all over, what about GPS?
> #define SDIO_VENDOR_ID_MARVELL 0x02df
> #define SDIO_DEVICE_ID_MARVELL_LIBERTAS 0x9103
Regards
Marcel
Hi Dave,
> From: Tomas Winkler <[email protected]>
> Date: Tue, 14 Jul 2009 01:09:13 +0300
>
> > 1. add intel's sdio vendor id to sdio_ids.h
> > 2. move iwmc3200 sdio devices ids to sdio_ids.h
> >
> > This patch is against 2.6.31-rc2
> > 7638d5322bd89d49e013a03fe2afaeb6d214fabd
> >
> > Cc:[email protected]
> > Cc:[email protected]
> > Cc:[email protected]
> > Cc:[email protected]
> > Cc:[email protected]
> > Signed-off-by: Tomas Winkler <[email protected]>
>
> Since wimax stuff goes directly through me and John Linville handles
> wireless things, you're making this overly difficult by combining
> changes for those two subsystems into a single patch.
>
> Please split this up, thanks.
if Pierre is not afraid of a merge conflict during the next merge window
with the SDIO changes, then I think this should go completely via you. I
am also fine if we just split this up and send one patch to Pierre and
one to you. However since speaking from history, your next tree gets
mostly merged before Pierre's we might producing build errors during the
next merge window.
I can ACK the WiMAX and WiFi changes since both Inaky and Samuel are on
vacation.
Regards
Marcel
> Subject: RE: [PATCH] imwc3200: move iwmc3200 SDIO ids to sdio_ids.h
BTW, subject should be "iwmc3200".
Thanks,
-yi
On Thu, Jul 16, 2009 at 3:23 PM, Zhu, Yi <[email protected]> wrote:
>
> > Subject: RE: [PATCH] imwc3200: move iwmc3200 SDIO ids to sdio_ids.h
>
> BTW, subject should be "iwmc3200".
Thanks. I'll address all comments although I'm not sure how to split
the patch since adding SDIO_VENDOR_ID_INTEL to sdio_ids.h it affects
all the drivers anyhow, so I'm suggesting to route it through netdev.
Thanks
Tomas
Hi Dave,
> > > Subject: RE: [PATCH] imwc3200: move iwmc3200 SDIO ids to sdio_ids.h
> >
> > BTW, subject should be "iwmc3200".
>
> Thanks. I'll address all comments although I'm not sure how to split
> the patch since adding SDIO_VENDOR_ID_INTEL to sdio_ids.h it affects
> all the drivers anyhow, so I'm suggesting to route it through netdev.
I think it is best that you take the whole patch via net-next-2.6 to
avoid breakage during the next merge window.
Regards
Marcel
From: Marcel Holtmann <[email protected]>
Date: Thu, 16 Jul 2009 18:57:34 +0200
> Hi Dave,
>
>> > > Subject: RE: [PATCH] imwc3200: move iwmc3200 SDIO ids to sdio_ids.h
>> >
>> > BTW, subject should be "iwmc3200".
>>
>> Thanks. I'll address all comments although I'm not sure how to split
>> the patch since adding SDIO_VENDOR_ID_INTEL to sdio_ids.h it affects
>> all the drivers anyhow, so I'm suggesting to route it through netdev.
>
> I think it is best that you take the whole patch via net-next-2.6 to
> avoid breakage during the next merge window.
Fair enough.
Hi Dave,
> >> > > Subject: RE: [PATCH] imwc3200: move iwmc3200 SDIO ids to sdio_ids.h
> >> >
> >> > BTW, subject should be "iwmc3200".
> >>
> >> Thanks. I'll address all comments although I'm not sure how to split
> >> the patch since adding SDIO_VENDOR_ID_INTEL to sdio_ids.h it affects
> >> all the drivers anyhow, so I'm suggesting to route it through netdev.
> >
> > I think it is best that you take the whole patch via net-next-2.6 to
> > avoid breakage during the next merge window.
>
> Fair enough.
after Tomas sent the revised version of course :)
Regards
Marcel