public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Adrian Bunk <bunk@stusta.de>
To: Andrew Morton <akpm@osdl.org>, Jean Delvare <khali@linux-fr.org>
Cc: linux-kernel@vger.kernel.org, christer@weinigel.se,
	Greg Kroah-Hartman <gregkh@suse.de>,
	i2c@lm-sensors.org
Subject: [-mm patch] drivers/i2c/busses/scx200_i2c.c: update struct scx200_i2c_data
Date: Sun, 27 Aug 2006 03:59:57 +0200	[thread overview]
Message-ID: <20060827015957.GN4765@stusta.de> (raw)
In-Reply-To: <20060826160922.3324a707.akpm@osdl.org>

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 = {


  parent reply	other threads:[~2006-08-27  2:00 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-08-26 23:09 2.6.18-rc4-mm3 Andrew Morton
2006-08-26 23:56 ` 2.6.18-rc4-mm3: ROOT_NFS=y compile error Adrian Bunk
2006-08-27 18:25   ` Chuck Lever
2006-08-27 20:56     ` Andrew Morton
2006-08-28 17:36       ` Chuck Lever
2006-08-28 17:43         ` Trond Myklebust
2006-08-27  1:59 ` Adrian Bunk [this message]
2006-08-27  8:20   ` [-mm patch] drivers/i2c/busses/scx200_i2c.c: update struct scx200_i2c_data Jean Delvare
2006-08-27  2:42 ` 2.6.18-rc4-mm3: NF_CONNTRACK_FTP=y compile error Adrian Bunk
2006-08-27  2:49   ` David Miller
2006-08-27  2:47 ` [-mm patch] struct i2c_algo_pcf_data: remove the mdelay member Adrian Bunk
2006-08-27  8:44   ` Jean Delvare
2006-08-27 12:50 ` 2.6.18-rc4-mm3 Benoit Boissinot
2006-08-28  7:35   ` 2.6.18-rc4-mm3 Pablo Neira Ayuso
2006-08-27 16:00 ` 2.6.18-rc4-mm3 Benoit Boissinot
2006-08-28  9:07 ` 2.6.18-rc4-mm3 Mel Gorman
2006-08-28 18:34   ` 2.6.18-rc4-mm3 Andrew Morton
2006-08-29 14:44     ` 2.6.18-rc4-mm3 Mel Gorman
2006-08-28 20:07 ` divide error: 0000 in fib6_rule_match [Re: 2.6.18-rc4-mm3] Mattia Dongili
2006-08-28 20:28   ` Andrew Morton
2006-08-28 21:22     ` Andi Kleen
2006-08-28 21:30   ` Andrew Morton
2006-08-28 21:51     ` divide error: 0000 in fib6_rule_match David Miller
2006-08-29  6:33     ` divide error: 0000 in fib6_rule_match [Re: 2.6.18-rc4-mm3] Mattia Dongili
2006-08-28 20:24 ` one more ACPI Error (utglobal-0125): Unknown exception code: 0xFFFFFFEA " Mattia Dongili
2006-08-28 22:16 ` 2.6.18-rc4-mm3 Rafael J. Wysocki
2006-08-29 13:37 ` 2.6.18-rc4-mm3 Haavard Skinnemoen
2006-08-29 15:18   ` 2.6.18-rc4-mm3 Cedric Le Goater
2006-08-29 15:42     ` 2.6.18-rc4-mm3 Haavard Skinnemoen
2006-08-30 20:35 ` [-mm patch] net/sched/act_simple.c: make struct simp_hash_info static Adrian Bunk
2006-08-30 22:03   ` David Miller
2006-08-30 20:35 ` [-mm patch] drivers/input/misc/wistron_btns.c: fix section mismatch Adrian Bunk
2006-08-30 23:26   ` Dmitry Torokhov
2006-08-30 23:36     ` Adrian Bunk
2006-08-31  2:54       ` Dmitry Torokhov
2006-08-30 20:35 ` [-mm patch] improve SECURITY_SELINUX_POLICYDB_VERSION_MAX{,_VALUE} help texts Adrian Bunk

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=20060827015957.GN4765@stusta.de \
    --to=bunk@stusta.de \
    --cc=akpm@osdl.org \
    --cc=christer@weinigel.se \
    --cc=gregkh@suse.de \
    --cc=i2c@lm-sensors.org \
    --cc=khali@linux-fr.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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