Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drivers/net/skfp/pmf.c: Use offsetof() macro

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>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

authored by

Takashi Iwai and committed by
Jeff Garzik
c2d1eb08 d1c5ea33

+11 -18
+11 -18
drivers/net/skfp/pmf.c
··· 44 44 int set, int local); 45 45 static int port_to_mib(struct s_smc *smc, int p); 46 46 47 - #define MOFFSS(e) ((int)&(((struct fddi_mib *)0)->e)) 48 - #define MOFFSA(e) ((int) (((struct fddi_mib *)0)->e)) 49 - 50 - #define MOFFMS(e) ((int)&(((struct fddi_mib_m *)0)->e)) 51 - #define MOFFMA(e) ((int) (((struct fddi_mib_m *)0)->e)) 52 - 53 - #define MOFFAS(e) ((int)&(((struct fddi_mib_a *)0)->e)) 54 - #define MOFFAA(e) ((int) (((struct fddi_mib_a *)0)->e)) 55 - 56 - #define MOFFPS(e) ((int)&(((struct fddi_mib_p *)0)->e)) 57 - #define MOFFPA(e) ((int) (((struct fddi_mib_p *)0)->e)) 47 + #define MOFFSS(e) offsetof(struct fddi_mib, e) 48 + #define MOFFMS(e) offsetof(struct fddi_mib_m, e) 49 + #define MOFFAS(e) offsetof(struct fddi_mib_a, e) 50 + #define MOFFPS(e) offsetof(struct fddi_mib_p, e) 58 51 59 52 60 53 #define AC_G 0x01 /* Get */ ··· 80 87 { SMT_P100D,AC_G, MOFFSS(fddiSMTOpVersionId), "S" } , 81 88 { SMT_P100E,AC_G, MOFFSS(fddiSMTHiVersionId), "S" } , 82 89 { SMT_P100F,AC_G, MOFFSS(fddiSMTLoVersionId), "S" } , 83 - { SMT_P1010,AC_G, MOFFSA(fddiSMTManufacturerData), "D" } , 84 - { SMT_P1011,AC_GR, MOFFSA(fddiSMTUserData), "D" } , 90 + { SMT_P1010,AC_G, MOFFSS(fddiSMTManufacturerData), "D" } , 91 + { SMT_P1011,AC_GR, MOFFSS(fddiSMTUserData), "D" } , 85 92 { SMT_P1012,AC_G, MOFFSS(fddiSMTMIBVersionId), "S" } , 86 93 87 94 /* StationConfigGrp */ ··· 96 103 { SMT_P101D,AC_GR, MOFFSS(fddiSMTTT_Notify), "wS" } , 97 104 { SMT_P101E,AC_GR, MOFFSS(fddiSMTStatRptPolicy), "bB" } , 98 105 { SMT_P101F,AC_GR, MOFFSS(fddiSMTTrace_MaxExpiration),"lL" } , 99 - { SMT_P1020,AC_G, MOFFSA(fddiSMTPORTIndexes), "II" } , 106 + { SMT_P1020,AC_G, MOFFSS(fddiSMTPORTIndexes), "II" } , 100 107 { SMT_P1021,AC_G, MOFFSS(fddiSMTMACIndexes), "I" } , 101 108 { SMT_P1022,AC_G, MOFFSS(fddiSMTBypassPresent), "F" } , 102 109 ··· 110 117 111 118 /* MIBOperationGrp */ 112 119 { SMT_P1032,AC_GROUP } , 113 - { SMT_P1033,AC_G, MOFFSA(fddiSMTTimeStamp),"P" } , 114 - { SMT_P1034,AC_G, MOFFSA(fddiSMTTransitionTimeStamp),"P" } , 120 + { SMT_P1033,AC_G, MOFFSS(fddiSMTTimeStamp),"P" } , 121 + { SMT_P1034,AC_G, MOFFSS(fddiSMTTransitionTimeStamp),"P" } , 115 122 /* NOTE : SMT_P1035 is already swapped ! SMT_P_SETCOUNT */ 116 123 { SMT_P1035,AC_G, MOFFSS(fddiSMTSetCount),"4P" } , 117 124 { SMT_P1036,AC_G, MOFFSS(fddiSMTLastSetStationId),"8" } , ··· 122 129 * PRIVATE EXTENSIONS 123 130 * only accessible locally to get/set passwd 124 131 */ 125 - { SMT_P10F0,AC_GR, MOFFSA(fddiPRPMFPasswd), "8" } , 132 + { SMT_P10F0,AC_GR, MOFFSS(fddiPRPMFPasswd), "8" } , 126 133 { SMT_P10F1,AC_GR, MOFFSS(fddiPRPMFStation), "8" } , 127 134 #ifdef ESS 128 135 { SMT_P10F2,AC_GR, MOFFSS(fddiESSPayload), "lL" } , ··· 238 245 { SMT_P400E,AC_GR, MOFFPS(fddiPORTConnectionPolicies),"bB" } , 239 246 { SMT_P400F,AC_G, MOFFPS(fddiPORTMacIndicated), "2" } , 240 247 { SMT_P4010,AC_G, MOFFPS(fddiPORTCurrentPath), "E" } , 241 - { SMT_P4011,AC_GR, MOFFPA(fddiPORTRequestedPaths), "l4" } , 248 + { SMT_P4011,AC_GR, MOFFPS(fddiPORTRequestedPaths), "l4" } , 242 249 { SMT_P4012,AC_G, MOFFPS(fddiPORTMACPlacement), "S" } , 243 250 { SMT_P4013,AC_G, MOFFPS(fddiPORTAvailablePaths), "B" } , 244 251 { SMT_P4016,AC_G, MOFFPS(fddiPORTPMDClass), "E" } ,