* [net-next 1/2] iwmc3200top: use prefered style for the device table.
@ 2009-11-14 18:36 Tomas Winkler
2009-11-14 18:36 ` [net-next 2/2] iwmc3200top: simplify the driver version Tomas Winkler
2009-11-16 6:09 ` [net-next 1/2] iwmc3200top: use prefered style for the device table David Miller
0 siblings, 2 replies; 4+ messages in thread
From: Tomas Winkler @ 2009-11-14 18:36 UTC (permalink / raw)
To: davem, netdev, linux-mmc
Cc: yi.zhu, inaky.perez-gonzalez, guy.cohen, ron.rindjunsky, Tomas Winkler
Use device id number directly accompany with
comment rather then a #define
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
---
drivers/misc/iwmc3200top/main.c | 14 +++-----------
1 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/drivers/misc/iwmc3200top/main.c b/drivers/misc/iwmc3200top/main.c
index 6e4e491..a1ce97e 100644
--- a/drivers/misc/iwmc3200top/main.c
+++ b/drivers/misc/iwmc3200top/main.c
@@ -62,15 +62,6 @@ MODULE_VERSION(DRIVER_VERSION);
MODULE_LICENSE("GPL");
MODULE_AUTHOR(DRIVER_COPYRIGHT);
-
-/* FIXME: These can be found in sdio_ids.h in newer kernels */
-#ifndef SDIO_INTEL_VENDOR_ID
-#define SDIO_INTEL_VENDOR_ID 0x0089
-#endif
-#ifndef SDIO_DEVICE_ID_INTEL_IWMC3200TOP
-#define SDIO_DEVICE_ID_INTEL_IWMC3200TOP 0x1404
-#endif
-
/*
* This workers main task is to wait for OP_OPR_ALIVE
* from TOP FW until ALIVE_MSG_TIMOUT timeout is elapsed.
@@ -662,8 +653,9 @@ static void iwmct_remove(struct sdio_func *func)
static const struct sdio_device_id iwmct_ids[] = {
- { SDIO_DEVICE(SDIO_INTEL_VENDOR_ID, SDIO_DEVICE_ID_INTEL_IWMC3200TOP)},
- { /* end: all zeroes */ },
+ /* Intel Wireless MultiCom 3200 Top Driver */
+ { SDIO_DEVICE(SDIO_VENDOR_ID_INTEL, 0x1404)},
+ { }, /* Terminating entry */
};
MODULE_DEVICE_TABLE(sdio, iwmct_ids);
--
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.
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [net-next 2/2] iwmc3200top: simplify the driver version
2009-11-14 18:36 [net-next 1/2] iwmc3200top: use prefered style for the device table Tomas Winkler
@ 2009-11-14 18:36 ` Tomas Winkler
2009-11-16 6:09 ` David Miller
2009-11-16 6:09 ` [net-next 1/2] iwmc3200top: use prefered style for the device table David Miller
1 sibling, 1 reply; 4+ messages in thread
From: Tomas Winkler @ 2009-11-14 18:36 UTC (permalink / raw)
To: davem, netdev, linux-mmc
Cc: yi.zhu, inaky.perez-gonzalez, guy.cohen, ron.rindjunsky, Tomas Winkler
drop the version parts not needed for in-tree driver
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
---
drivers/misc/iwmc3200top/main.c | 16 +---------------
1 files changed, 1 insertions(+), 15 deletions(-)
diff --git a/drivers/misc/iwmc3200top/main.c b/drivers/misc/iwmc3200top/main.c
index a1ce97e..02b3dad 100644
--- a/drivers/misc/iwmc3200top/main.c
+++ b/drivers/misc/iwmc3200top/main.c
@@ -41,21 +41,7 @@
#define DRIVER_DESCRIPTION "Intel(R) IWMC 3200 Top Driver"
#define DRIVER_COPYRIGHT "Copyright (c) 2008 Intel Corporation."
-#define IWMCT_VERSION "0.1.62"
-
-#ifdef REPOSITORY_LABEL
-#define RL REPOSITORY_LABEL
-#else
-#define RL local
-#endif
-
-#ifdef CONFIG_IWMC3200TOP_DEBUG
-#define VD "-d"
-#else
-#define VD
-#endif
-
-#define DRIVER_VERSION IWMCT_VERSION "-" __stringify(RL) VD
+#define DRIVER_VERSION "0.1.62"
MODULE_DESCRIPTION(DRIVER_DESCRIPTION);
MODULE_VERSION(DRIVER_VERSION);
--
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.
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [net-next 1/2] iwmc3200top: use prefered style for the device table.
2009-11-14 18:36 [net-next 1/2] iwmc3200top: use prefered style for the device table Tomas Winkler
2009-11-14 18:36 ` [net-next 2/2] iwmc3200top: simplify the driver version Tomas Winkler
@ 2009-11-16 6:09 ` David Miller
1 sibling, 0 replies; 4+ messages in thread
From: David Miller @ 2009-11-16 6:09 UTC (permalink / raw)
To: tomas.winkler
Cc: netdev, linux-mmc, yi.zhu, inaky.perez-gonzalez, guy.cohen,
ron.rindjunsky
From: Tomas Winkler <tomas.winkler@intel.com>
Date: Sat, 14 Nov 2009 20:36:35 +0200
> Use device id number directly accompany with
> comment rather then a #define
>
> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Applied.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [net-next 2/2] iwmc3200top: simplify the driver version
2009-11-14 18:36 ` [net-next 2/2] iwmc3200top: simplify the driver version Tomas Winkler
@ 2009-11-16 6:09 ` David Miller
0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2009-11-16 6:09 UTC (permalink / raw)
To: tomas.winkler
Cc: netdev, linux-mmc, yi.zhu, inaky.perez-gonzalez, guy.cohen,
ron.rindjunsky
From: Tomas Winkler <tomas.winkler@intel.com>
Date: Sat, 14 Nov 2009 20:36:36 +0200
> drop the version parts not needed for in-tree driver
>
> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Applied.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-11-16 6:09 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-11-14 18:36 [net-next 1/2] iwmc3200top: use prefered style for the device table Tomas Winkler
2009-11-14 18:36 ` [net-next 2/2] iwmc3200top: simplify the driver version Tomas Winkler
2009-11-16 6:09 ` David Miller
2009-11-16 6:09 ` [net-next 1/2] iwmc3200top: use prefered style for the device table David Miller
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.