From: Wolfgang Grandegger <wg@grandegger•com>
To: Grant Likely <grant.likely@secretlab•ca>
Cc: Ben Dooks <ben-linux@fluff•org>,
Devicetree-discuss@lists•ozlabs.org,
Linuxppc-dev@lists•ozlabs.org, Linux-i2c@vger•kernel.org,
Wolfgang Grandegger <wg@denx•de>
Subject: Re: [PATCH v4 1/3] i2c-mpc: use __devinit[data] for initialization functions and data
Date: Wed, 10 Feb 2010 11:09:25 +0100 [thread overview]
Message-ID: <4B7285D5.9060008@grandegger.com> (raw)
In-Reply-To: <fa686aa41002090941je3e4fdqbecf2616a8b90e42@mail.gmail.com>
Grant Likely wrote:
> On Thu, Jan 28, 2010 at 6:25 AM, Wolfgang Grandegger <wg@grandegger•com> wrote:
>> From: Wolfgang Grandegger <wg@denx•de>
>>
>> "__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 <wg@denx•de>
>
> Several comments below.
>
>> ---
>> drivers/i2c/busses/i2c-mpc.c | 103 +++++++++++++++++++----------------------
>> 1 files changed, 48 insertions(+), 55 deletions(-)
>>
>> diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c
>> index f627001..275ebe6 100644
>> --- a/drivers/i2c/busses/i2c-mpc.c
>> +++ b/drivers/i2c/busses/i2c-mpc.c
>> @@ -66,7 +66,7 @@ struct mpc_i2c_divider {
>> u16 fdr; /* including dfsrr */
>> };
>>
>> -struct mpc_i2c_match_data {
>> +struct mpc_i2c_data {
>> void (*setclock)(struct device_node *node,
>> struct mpc_i2c *i2c,
>> u32 clock, u32 prescaler);
>> @@ -165,7 +165,7 @@ static int i2c_wait(struct mpc_i2c *i2c, unsigned timeout, int writing)
>> }
>>
>> #ifdef CONFIG_PPC_MPC52xx
>> -static const struct mpc_i2c_divider mpc_i2c_dividers_52xx[] = {
>> +static const struct __devinitdata mpc_i2c_divider mpc_i2c_dividers_52xx[] = {
>
> __devinitdata goes at the end, immediately before the '='. Ditto
> throughout the file.
This made a difference and revealed section mismatches. "const" seems to
be incompatible with "__devinitdata".
>> {20, 0x20}, {22, 0x21}, {24, 0x22}, {26, 0x23},
>> {28, 0x24}, {30, 0x01}, {32, 0x25}, {34, 0x02},
>> {36, 0x26}, {40, 0x27}, {44, 0x04}, {48, 0x28},
>> @@ -582,44 +584,35 @@ static int __devexit fsl_i2c_remove(struct of_device *op)
>> return 0;
>> };
>>
>> +static struct mpc_i2c_data __devinitdata mpc_i2c_data_52xx = {
>> + .setclock = mpc_i2c_setclock_52xx,
>> +};
>> +
>> +static struct mpc_i2c_data __devinitdata mpc_i2c_data_8313 = {
>> + .setclock = mpc_i2c_setclock_8xxx,
>> +};
>> +
>> +static struct mpc_i2c_data __devinitdata mpc_i2c_data_8543 = {
>> + .setclock = mpc_i2c_setclock_8xxx,
>> + .prescaler = 2,
>> +};
>> +
>> +static struct mpc_i2c_data __devinitdata mpc_i2c_data_8544 = {
>> + .setclock = mpc_i2c_setclock_8xxx,
>> + .prescaler = 3,
>> +};
>> +
>> static const struct of_device_id mpc_i2c_of_match[] = {
>
> You can make this __devinitdata too.
This results in a section mismatch as it's referenced by fsl_i2c_init().
I just sent out v6. Hope it's OK now.
Thanks,
Wolfgang.
next prev parent reply other threads:[~2010-02-10 10:09 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-28 13:25 [PATCH v4 0/3] i2c-mpc: add support for the Freescale MPC512x and other fixes Wolfgang Grandegger
2010-01-28 13:25 ` [PATCH v4 1/3] i2c-mpc: use __devinit[data] for initialization functions and data Wolfgang Grandegger
2010-01-28 13:25 ` [PATCH v4 2/3] i2c-mpc: add support for the MPC512x processors from Freescale Wolfgang Grandegger
2010-01-28 13:25 ` [PATCH v4 3/3] powerpc: doc/dts-bindings: update doc of FSL I2C bindings Wolfgang Grandegger
2010-01-29 16:26 ` Wolfram Sang
2010-02-09 17:50 ` Grant Likely
2010-02-09 18:57 ` Wolfgang Grandegger
2010-02-09 19:23 ` Wolfgang Grandegger
2010-02-09 22:15 ` Grant Likely
2010-01-29 16:24 ` [PATCH v4 2/3] i2c-mpc: add support for the MPC512x processors from Freescale Wolfram Sang
2010-02-09 17:45 ` Grant Likely
2010-01-29 16:15 ` [PATCH v4 1/3] i2c-mpc: use __devinit[data] for initialization functions and data Wolfram Sang
2010-02-09 17:41 ` Grant Likely
2010-02-10 10:09 ` Wolfgang Grandegger [this message]
2010-02-10 10:32 ` Stephen Rothwell
2010-02-10 10:53 ` Wolfgang Grandegger
2010-02-10 14:14 ` Grant Likely
2010-02-10 14:45 ` Wolfgang Grandegger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4B7285D5.9060008@grandegger.com \
--to=wg@grandegger$(echo .)com \
--cc=Devicetree-discuss@lists$(echo .)ozlabs.org \
--cc=Linux-i2c@vger$(echo .)kernel.org \
--cc=Linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=ben-linux@fluff$(echo .)org \
--cc=grant.likely@secretlab$(echo .)ca \
--cc=wg@denx$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox