[patch for 2.6.27? 1/6] drivers/net/skfp/pmf.c: Use offsetof() macro

Previous thread: [patch for 2.6.27? 3/6] e1000: prevent corruption of EEPROM/NVM by akpm on Friday, September 5, 2008 - 5:04 pm. (3 messages)

Next thread: [patch for 2.6.27? 2/6] drivers/net/atl1e/: don't take the mdio_lock in atl1e_probe by akpm on Friday, September 5, 2008 - 5:04 pm. (1 message)
To: <jeff@...>
Cc: <netdev@...>, <akpm@...>, <tiwai@...>, <alan@...>
Date: Friday, September 5, 2008 - 5:04 pm

From: Takashi Iwai <tiwai@suse.de>

Self-baked macros cause bunch of compile warnings like below:

CC [M] drivers/net/skfp/pmf.o
CC net/ipv4/fib_semantics.o
drivers/net/skfp/pmf.c:86: warning: cast from pointer to integer of different size
drivers/net/skfp/pmf.c:87: warning: cast from pointer to integer of different size
...

Use the standard offsetof() macro instead.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Alan Cox <alan@redhat.com>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

drivers/net/skfp/pmf.c | 29 +++++++++++------------------
1 file changed, 11 insertions(+), 18 deletions(-)

diff -puN drivers/net/skfp/pmf.c~drivers-net-skfp-pmfc-use-offsetof-macro drivers/net/skfp/pmf.c
--- a/drivers/net/skfp/pmf.c~drivers-net-skfp-pmfc-use-offsetof-macro
+++ a/drivers/net/skfp/pmf.c
@@ -44,17 +44,10 @@ static SMbuf *smt_build_pmf_response(str
int set, int local);
static int port_to_mib(struct s_smc *smc, int p);

-#define MOFFSS(e) ((int)&(((struct fddi_mib *)0)->e))
-#define MOFFSA(e) ((int) (((struct fddi_mib *)0)->e))
-
-#define MOFFMS(e) ((int)&(((struct fddi_mib_m *)0)->e))
-#define MOFFMA(e) ((int) (((struct fddi_mib_m *)0)->e))
-
-#define MOFFAS(e) ((int)&(((struct fddi_mib_a *)0)->e))
-#define MOFFAA(e) ((int) (((struct fddi_mib_a *)0)->e))
-
-#define MOFFPS(e) ((int)&(((struct fddi_mib_p *)0)->e))
-#define MOFFPA(e) ((int) (((struct fddi_mib_p *)0)->e))
+#define MOFFSS(e) offsetof(struct fddi_mib, e)
+#define MOFFMS(e) offsetof(struct fddi_mib_m, e)
+#define MOFFAS(e) offsetof(struct fddi_mib_a, e)
+#define MOFFPS(e) offsetof(struct fddi_mib_p, e)

#define AC_G 0x01 /* Get */
@@ -87,8 +80,8 @@ static const struct s_p_tab {
{ SMT_P100D,AC_G, MOFFSS(fddiSMTOpVersionId), "S" } ,
{ SMT_P100E,AC_G, MOFFSS(fddiSMTHiVersionId), "S" } ,
{ SMT_P100F,AC_G, MOFFSS(fddiSMTLoVersionId), "S" } ,
- { SMT_P...

To: <akpm@...>
Cc: <netdev@...>, <tiwai@...>, <alan@...>
Date: Saturday, September 13, 2008 - 3:13 pm

applied

--

Previous thread: [patch for 2.6.27? 3/6] e1000: prevent corruption of EEPROM/NVM by akpm on Friday, September 5, 2008 - 5:04 pm. (3 messages)

Next thread: [patch for 2.6.27? 2/6] drivers/net/atl1e/: don't take the mdio_lock in atl1e_probe by akpm on Friday, September 5, 2008 - 5:04 pm. (1 message)