lkml.org 
[lkml]   [2006]   [Aug]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [-mm patch] drivers/i2c/busses/scx200_i2c.c: update struct scx200_i2c_data
    Hi Adrian,

    > On Sat, Aug 26, 2006 at 04:09:22PM -0700, Andrew Morton wrote:
    > >...
    > > Changes since 2.6.18-rc4-mm2:
    > >...
    > > +gregkh-i2c-i2c-algo-bit-kill-mdelay.patch
    > >...
    > > I2C tree updates
    > >...
    >
    > drivers/i2c/busses/scx200_i2c.c was forgotten:
    >
    > <-- snip -->
    >
    > ...
    > CC drivers/i2c/busses/scx200_i2c.o
    > /home/bunk/linux/kernel-2.6/linux-2.6.18-rc4-mm3/drivers/i2c/busses/scx200_i2c.c:79: warning: excess elements in struct initializer
    > /home/bunk/linux/kernel-2.6/linux-2.6.18-rc4-mm3/drivers/i2c/busses/scx200_i2c.c:79: warning: (near initialization for ‘scx200_i2c_data’)
    > ...
    >
    > <-- snip -->
    >
    > While fixing it, I also converted the struct to C99 initializers.
    >
    > Signed-off-by: Adrian Bunk <bunk@stusta.de>
    >
    > --- linux-2.6.18-rc4-mm3/drivers/i2c/busses/scx200_i2c.c.old 2006-08-27 03:57:50.000000000 +0200
    > +++ linux-2.6.18-rc4-mm3/drivers/i2c/busses/scx200_i2c.c 2006-08-27 03:51:50.000000000 +0200
    > @@ -71,12 +71,12 @@
    > */
    >
    > static struct i2c_algo_bit_data scx200_i2c_data = {
    > - NULL,
    > - scx200_i2c_setsda,
    > - scx200_i2c_setscl,
    > - scx200_i2c_getsda,
    > - scx200_i2c_getscl,
    > - 10, 10, 100, /* waits, timeout */
    > + .setsda = scx200_i2c_setsda,
    > + .setscl = scx200_i2c_setscl,
    > + .getsda = scx200_i2c_getsda,
    > + .getscl = scx200_i2c_getscl,
    > + .udelay = 10,
    > + .timeout = 100,
    > };
    >
    > static struct i2c_adapter scx200_i2c_ops = {

    Good catch, thanks for fixing that. I tried to catch and fix all users
    when dropping mdelay from struct i2c_algo_bit_data, but obviously I
    missed this one.

    Patch applied.

    --
    Jean Delvare
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2006-08-27 10:23    [W:0.021 / U:62.204 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site