From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: MIME-Version: 1.0 Sender: glikely@secretlab.ca In-Reply-To: <1265813711-16794-2-git-send-email-wg@grandegger.com> References: <1265813711-16794-1-git-send-email-wg@grandegger.com> <1265813711-16794-2-git-send-email-wg@grandegger.com> From: Grant Likely Date: Tue, 16 Feb 2010 11:40:35 -0700 Message-ID: Subject: Re: [PATCH v7 1/4] i2c-mpc: use __devinit[data] for initialization functions and data To: Wolfgang Grandegger Content-Type: text/plain; charset=ISO-8859-1 Cc: Ben Dooks , Devicetree-discuss@lists.ozlabs.org, Linuxppc-dev@lists.ozlabs.org, Linux-i2c@vger.kernel.org, Wolfgang Grandegger List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Wed, Feb 10, 2010 at 7:55 AM, Wolfgang Grandegger wr= ote: > From: Wolfgang Grandegger > > "__devinit[data]" has not yet been used for all initialization functions > and data. To avoid truncating lines, the struct "mpc_i2c_match_data" has > been renamed to "mpc_i2c_data", which is even the better name. > > Signed-off-by: Wolfgang Grandegger > Tested-by: Wolfram Sang Between patch 1 & 2 is not bisectable. Functions still called *_setclock in this patch, but referenced as *_setup in the structure. Please respin. Also ... > +static struct mpc_i2c_data mpc_i2c_data_52xx __devinitdata =3D { > + =A0 =A0 =A0 .setup =3D mpc_i2c_setup_52xx, > +}; > + > +static struct mpc_i2c_data mpc_i2c_data_8313 __devinitdata =3D { > + =A0 =A0 =A0 .setup =3D mpc_i2c_setup_8xxx, > +}; > + > +static struct mpc_i2c_data mpc_i2c_data_8543 __devinitdata =3D { > + =A0 =A0 =A0 .setup =3D mpc_i2c_setup_8xxx, > + =A0 =A0 =A0 .prescaler =3D 2, > +}; > + > +static struct mpc_i2c_data mpc_i2c_data_8544 __devinitdata =3D { > + =A0 =A0 =A0 .setup =3D mpc_i2c_setup_8xxx, > + =A0 =A0 =A0 .prescaler =3D 3, > +}; > + > =A0static const struct of_device_id mpc_i2c_of_match[] =3D { > - =A0 =A0 =A0 {.compatible =3D "mpc5200-i2c", > - =A0 =A0 =A0 =A0.data =3D &(struct mpc_i2c_match_data) { > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 .setclock =3D mpc_i2c_setcl= ock_52xx, > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 }, > - =A0 =A0 =A0 }, > - =A0 =A0 =A0 {.compatible =3D "fsl,mpc5200b-i2c", > - =A0 =A0 =A0 =A0.data =3D &(struct mpc_i2c_match_data) { > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 .setclock =3D mpc_i2c_setcl= ock_52xx, > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 }, > - =A0 =A0 =A0 }, > - =A0 =A0 =A0 {.compatible =3D "fsl,mpc5200-i2c", > - =A0 =A0 =A0 =A0.data =3D &(struct mpc_i2c_match_data) { > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 .setclock =3D mpc_i2c_setcl= ock_52xx, > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 }, > - =A0 =A0 =A0 }, > - =A0 =A0 =A0 {.compatible =3D "fsl,mpc8313-i2c", > - =A0 =A0 =A0 =A0.data =3D &(struct mpc_i2c_match_data) { > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 .setclock =3D mpc_i2c_setcl= ock_8xxx, > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 }, > - =A0 =A0 =A0 }, > - =A0 =A0 =A0 {.compatible =3D "fsl,mpc8543-i2c", > - =A0 =A0 =A0 =A0.data =3D &(struct mpc_i2c_match_data) { > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 .setclock =3D mpc_i2c_setcl= ock_8xxx, > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 .prescaler =3D 2, > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 }, > - =A0 =A0 =A0 }, > - =A0 =A0 =A0 {.compatible =3D "fsl,mpc8544-i2c", > - =A0 =A0 =A0 =A0.data =3D &(struct mpc_i2c_match_data) { > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 .setclock =3D mpc_i2c_setcl= ock_8xxx, > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 .prescaler =3D 3, > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 }, > + =A0 =A0 =A0 {.compatible =3D "mpc5200-i2c", .data =3D &mpc_i2c_data_52x= x, }, > + =A0 =A0 =A0 {.compatible =3D "fsl,mpc5200b-i2c", .data =3D &mpc_i2c_dat= a_52xx, }, > + =A0 =A0 =A0 {.compatible =3D "fsl,mpc5200-i2c", .data =3D &mpc_i2c_data= _52xx, }, > + =A0 =A0 =A0 {.compatible =3D "fsl,mpc8313-i2c", .data =3D &mpc_i2c_data= _8313, }, > + =A0 =A0 =A0 {.compatible =3D "fsl,mpc8543-i2c", .data =3D &mpc_i2c_data= _8543, }, > + =A0 =A0 =A0 {.compatible =3D "fsl,mpc8544-i2c", .data =3D &mpc_i2c_data= _8544, }, ... what was wrong with the old format of declaring the .data structures inline with the match table? g.