{"id":944,"url":"http://patchwork.ozlabs.org/api/1.0/patches/944/?format=json","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.0/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null},"msgid":"<200809222110.m8MLAHIA029867@imap1.linux-foundation.org>","date":"2008-09-22T21:10:16","name":"[for,2.6.27?,02/10] drivers/net/skfp/pmf.c: Use offsetof() macro","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"6a3376e0f117b49a11d678e628b188278327e370","submitter":{"id":107,"url":"http://patchwork.ozlabs.org/api/1.0/people/107/?format=json","name":"Andrew Morton","email":"akpm@linux-foundation.org"},"delegate":{"id":36,"url":"http://patchwork.ozlabs.org/api/1.0/users/36/?format=json","username":"jgarzik","first_name":"Jeff","last_name":"Garzik","email":"jgarzik@pobox.com"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/200809222110.m8MLAHIA029867@imap1.linux-foundation.org/mbox/","series":[],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/944/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Received":["from vger.kernel.org (vger.kernel.org [209.132.176.167])\n\tby ozlabs.org (Postfix) with ESMTP id B3C0BDDE23\n\tfor ;\n\tTue, 23 Sep 2008 07:13:16 +1000 (EST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1753202AbYIVVNL (ORCPT );\n\tMon, 22 Sep 2008 17:13:11 -0400","(majordomo@vger.kernel.org) by vger.kernel.org id S1753178AbYIVVNK\n\t(ORCPT ); Mon, 22 Sep 2008 17:13:10 -0400","from smtp1.linux-foundation.org ([140.211.169.13]:52099 \"EHLO\n\tsmtp1.linux-foundation.org\" rhost-flags-OK-OK-OK-OK)\n\tby vger.kernel.org with ESMTP id S1753108AbYIVVNJ (ORCPT\n\t); Mon, 22 Sep 2008 17:13:09 -0400","from imap1.linux-foundation.org (imap1.linux-foundation.org\n\t[140.211.169.55])\n\tby smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with\n\tESMTP id m8MLAH8J014564\n\t(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);\n\tMon, 22 Sep 2008 14:10:18 -0700","from localhost.localdomain (localhost [127.0.0.1])\n\tby imap1.linux-foundation.org\n\t(8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with ESMTP id\n\tm8MLAHIA029867; Mon, 22 Sep 2008 14:10:17 -0700"],"Message-Id":"<200809222110.m8MLAHIA029867@imap1.linux-foundation.org>","Subject":"[patch for 2.6.27? 02/10] drivers/net/skfp/pmf.c: Use offsetof()\n\tmacro","To":"jeff@garzik.org","Cc":"netdev@vger.kernel.org, akpm@linux-foundation.org, tiwai@suse.de,\n\talan@redhat.com","From":"akpm@linux-foundation.org","Date":"Mon, 22 Sep 2008 14:10:16 -0700","X-Spam-Status":"No, hits=-3.358 required=5 tests=AWL, BAYES_00,\n\tOSDL_HEADER_SUBJECT_BRACKETED","X-Spam-Checker-Version":"SpamAssassin 3.2.4-osdl_revision__1.47__","X-MIMEDefang-Filter":"lf$Revision: 1.188 $","X-Scanned-By":"MIMEDefang 2.63 on 140.211.169.13","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"From: Takashi Iwai \n\nSelf-baked macros cause bunch of compile warnings like below:\n\n CC [M] drivers/net/skfp/pmf.o\n CC net/ipv4/fib_semantics.o\ndrivers/net/skfp/pmf.c:86: warning: cast from pointer to integer of different size\ndrivers/net/skfp/pmf.c:87: warning: cast from pointer to integer of different size\n...\n\nUse the standard offsetof() macro instead.\n\nSigned-off-by: Takashi Iwai \nAcked-by: Alan Cox \nCc: Jeff Garzik \nSigned-off-by: Andrew Morton \n---\n\n drivers/net/skfp/pmf.c | 29 +++++++++++------------------\n 1 file changed, 11 insertions(+), 18 deletions(-)","diff":"diff -puN drivers/net/skfp/pmf.c~drivers-net-skfp-pmfc-use-offsetof-macro drivers/net/skfp/pmf.c\n--- a/drivers/net/skfp/pmf.c~drivers-net-skfp-pmfc-use-offsetof-macro\n+++ a/drivers/net/skfp/pmf.c\n@@ -44,17 +44,10 @@ static SMbuf *smt_build_pmf_response(str\n \t\t\t\t int set, int local);\n static int port_to_mib(struct s_smc *smc, int p);\n \n-#define MOFFSS(e)\t((int)&(((struct fddi_mib *)0)->e))\n-#define MOFFSA(e)\t((int) (((struct fddi_mib *)0)->e))\n-\n-#define MOFFMS(e)\t((int)&(((struct fddi_mib_m *)0)->e))\n-#define MOFFMA(e)\t((int) (((struct fddi_mib_m *)0)->e))\n-\n-#define MOFFAS(e)\t((int)&(((struct fddi_mib_a *)0)->e))\n-#define MOFFAA(e)\t((int) (((struct fddi_mib_a *)0)->e))\n-\n-#define MOFFPS(e)\t((int)&(((struct fddi_mib_p *)0)->e))\n-#define MOFFPA(e)\t((int) (((struct fddi_mib_p *)0)->e))\n+#define MOFFSS(e)\toffsetof(struct fddi_mib, e)\n+#define MOFFMS(e)\toffsetof(struct fddi_mib_m, e)\n+#define MOFFAS(e)\toffsetof(struct fddi_mib_a, e)\n+#define MOFFPS(e)\toffsetof(struct fddi_mib_p, e)\n \n \n #define AC_G\t0x01\t\t/* Get */\n@@ -87,8 +80,8 @@ static const struct s_p_tab {\n \t{ SMT_P100D,AC_G,\tMOFFSS(fddiSMTOpVersionId),\t\"S\"\t} ,\n \t{ SMT_P100E,AC_G,\tMOFFSS(fddiSMTHiVersionId),\t\"S\"\t} ,\n \t{ SMT_P100F,AC_G,\tMOFFSS(fddiSMTLoVersionId),\t\"S\"\t} ,\n-\t{ SMT_P1010,AC_G,\tMOFFSA(fddiSMTManufacturerData), \"D\" } ,\n-\t{ SMT_P1011,AC_GR,\tMOFFSA(fddiSMTUserData),\t\"D\"\t} ,\n+\t{ SMT_P1010,AC_G,\tMOFFSS(fddiSMTManufacturerData), \"D\" } ,\n+\t{ SMT_P1011,AC_GR,\tMOFFSS(fddiSMTUserData),\t\"D\"\t} ,\n \t{ SMT_P1012,AC_G,\tMOFFSS(fddiSMTMIBVersionId),\t\"S\"\t} ,\n \n \t/* StationConfigGrp */\n@@ -103,7 +96,7 @@ static const struct s_p_tab {\n \t{ SMT_P101D,AC_GR,\tMOFFSS(fddiSMTTT_Notify),\t\"wS\"\t} ,\n \t{ SMT_P101E,AC_GR,\tMOFFSS(fddiSMTStatRptPolicy),\t\"bB\"\t} ,\n \t{ SMT_P101F,AC_GR,\tMOFFSS(fddiSMTTrace_MaxExpiration),\"lL\"\t} ,\n-\t{ SMT_P1020,AC_G,\tMOFFSA(fddiSMTPORTIndexes),\t\"II\"\t} ,\n+\t{ SMT_P1020,AC_G,\tMOFFSS(fddiSMTPORTIndexes),\t\"II\"\t} ,\n \t{ SMT_P1021,AC_G,\tMOFFSS(fddiSMTMACIndexes),\t\"I\"\t} ,\n \t{ SMT_P1022,AC_G,\tMOFFSS(fddiSMTBypassPresent),\t\"F\"\t} ,\n \n@@ -117,8 +110,8 @@ static const struct s_p_tab {\n \n \t/* MIBOperationGrp */\n \t{ SMT_P1032,AC_GROUP\t} ,\n-\t{ SMT_P1033,AC_G,\tMOFFSA(fddiSMTTimeStamp),\"P\"\t\t} ,\n-\t{ SMT_P1034,AC_G,\tMOFFSA(fddiSMTTransitionTimeStamp),\"P\"\t} ,\n+\t{ SMT_P1033,AC_G,\tMOFFSS(fddiSMTTimeStamp),\"P\"\t\t} ,\n+\t{ SMT_P1034,AC_G,\tMOFFSS(fddiSMTTransitionTimeStamp),\"P\"\t} ,\n \t/* NOTE : SMT_P1035 is already swapped ! SMT_P_SETCOUNT */\n \t{ SMT_P1035,AC_G,\tMOFFSS(fddiSMTSetCount),\"4P\"\t\t} ,\n \t{ SMT_P1036,AC_G,\tMOFFSS(fddiSMTLastSetStationId),\"8\"\t} ,\n@@ -129,7 +122,7 @@ static const struct s_p_tab {\n \t * PRIVATE EXTENSIONS\n \t * only accessible locally to get/set passwd\n \t */\n-\t{ SMT_P10F0,AC_GR,\tMOFFSA(fddiPRPMFPasswd),\t\"8\"\t} ,\n+\t{ SMT_P10F0,AC_GR,\tMOFFSS(fddiPRPMFPasswd),\t\"8\"\t} ,\n \t{ SMT_P10F1,AC_GR,\tMOFFSS(fddiPRPMFStation),\t\"8\"\t} ,\n #ifdef\tESS\n \t{ SMT_P10F2,AC_GR,\tMOFFSS(fddiESSPayload),\t\t\"lL\"\t} ,\n@@ -245,7 +238,7 @@ static const struct s_p_tab {\n \t{ SMT_P400E,AC_GR,\tMOFFPS(fddiPORTConnectionPolicies),\"bB\"\t} ,\n \t{ SMT_P400F,AC_G,\tMOFFPS(fddiPORTMacIndicated),\t\"2\"\t} ,\n \t{ SMT_P4010,AC_G,\tMOFFPS(fddiPORTCurrentPath),\t\"E\"\t} ,\n-\t{ SMT_P4011,AC_GR,\tMOFFPA(fddiPORTRequestedPaths),\t\"l4\"\t} ,\n+\t{ SMT_P4011,AC_GR,\tMOFFPS(fddiPORTRequestedPaths),\t\"l4\"\t} ,\n \t{ SMT_P4012,AC_G,\tMOFFPS(fddiPORTMACPlacement),\t\"S\"\t} ,\n \t{ SMT_P4013,AC_G,\tMOFFPS(fddiPORTAvailablePaths),\t\"B\"\t} ,\n \t{ SMT_P4016,AC_G,\tMOFFPS(fddiPORTPMDClass),\t\"E\"\t} ,\n","prefixes":["for","2.6.27?","02/10"]}