Commit 8ac2120d authored Sep 16, 2005 by Jean Delvare Committed by Linus Torvalds Sep 17, 2005

[PATCH] i2c: kill an unused i2c_adapter struct member



Kill an unused member of the i2c_adapter structure.  This additionally
fixes a potential bug, because <linux/i2c.h> doesn't include
<linux/config.h>, so different files including <linux/i2c.h> could see a
different definition of the i2c_adapter structure, depending on them
including <linux/config.h> (or other header files themselves including
<linux/config.h>) before <linux/i2c.h>, or not.

Credits go to Jörn Engel for pointing me to the problem.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent 393ad299

include/linux/i2c.h

+0 −5

Original line number	Diff line number	Diff line
		@@ -230,11 +230,6 @@ struct i2c_adapter {
		struct device dev; /* the adapter device */
		struct class_device class_dev; /* the class device */

		#ifdef CONFIG_PROC_FS
		/* No need to set this when you initialize the adapter */
		int inode;
		#endif /* def CONFIG_PROC_FS */

		int nr;
		struct list_head clients;
		struct list_head list;

Admin message