diff for duplicates of <20050815175413.GD24959@litech.org> diff --git a/a/1.txt b/N1/1.txt index ffdd2ad..d58c89e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -16,7 +16,8 @@ Signed-off-by: Nathan Lutchansky <lutchann@litech.org> 9 files changed, 18 insertions(+), 66 deletions(-) Index: linux-2.6.13-rc6+gregkh/drivers/i2c/chips/ds1337.c -=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/i2c/chips/ds1337.c +=================================================================== +--- linux-2.6.13-rc6+gregkh.orig/drivers/i2c/chips/ds1337.c +++ linux-2.6.13-rc6+gregkh/drivers/i2c/chips/ds1337.c @@ -41,7 +41,6 @@ static unsigned short normal_i2c[] = { 0 @@ -26,7 +27,8 @@ Index: linux-2.6.13-rc6+gregkh/drivers/i2c/chips/ds1337.c static int ds1337_detect(struct i2c_adapter *adapter, int address, int kind); static void ds1337_init_client(struct i2c_client *client); static int ds1337_detach_client(struct i2c_client *client); -@@ -55,7 +54,8 @@ static struct i2c_driver ds1337_driver .owner = THIS_MODULE, +@@ -55,7 +54,8 @@ static struct i2c_driver ds1337_driver = + .owner = THIS_MODULE, .name = "ds1337", .flags = I2C_DF_NOTIFY, - .attach_adapter = ds1337_attach_adapter, @@ -48,7 +50,8 @@ Index: linux-2.6.13-rc6+gregkh/drivers/i2c/chips/ds1337.c * The following function does more than just detection. If detection * succeeds, it also registers the new chip. Index: linux-2.6.13-rc6+gregkh/drivers/i2c/chips/ds1374.c -=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/i2c/chips/ds1374.c +=================================================================== +--- linux-2.6.13-rc6+gregkh.orig/drivers/i2c/chips/ds1374.c +++ linux-2.6.13-rc6+gregkh/drivers/i2c/chips/ds1374.c @@ -216,11 +216,6 @@ static int ds1374_probe(struct i2c_adapt return 0; @@ -62,7 +65,8 @@ Index: linux-2.6.13-rc6+gregkh/drivers/i2c/chips/ds1374.c static int ds1374_detach(struct i2c_client *client) { int rc; -@@ -237,7 +232,8 @@ static struct i2c_driver ds1374_driver .name = DS1374_DRV_NAME, +@@ -237,7 +232,8 @@ static struct i2c_driver ds1374_driver = + .name = DS1374_DRV_NAME, .id = I2C_DRIVERID_DS1374, .flags = I2C_DF_NOTIFY, - .attach_adapter = ds1374_attach, @@ -72,7 +76,8 @@ Index: linux-2.6.13-rc6+gregkh/drivers/i2c/chips/ds1374.c }; Index: linux-2.6.13-rc6+gregkh/drivers/i2c/chips/eeprom.c -=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/i2c/chips/eeprom.c +=================================================================== +--- linux-2.6.13-rc6+gregkh.orig/drivers/i2c/chips/eeprom.c +++ linux-2.6.13-rc6+gregkh/drivers/i2c/chips/eeprom.c @@ -62,7 +62,6 @@ struct eeprom_data { }; @@ -82,7 +87,8 @@ Index: linux-2.6.13-rc6+gregkh/drivers/i2c/chips/eeprom.c static int eeprom_detect(struct i2c_adapter *adapter, int address, int kind); static int eeprom_detach_client(struct i2c_client *client); -@@ -72,7 +71,8 @@ static struct i2c_driver eeprom_driver .name = "eeprom", +@@ -72,7 +71,8 @@ static struct i2c_driver eeprom_driver = + .name = "eeprom", .id = I2C_DRIVERID_EEPROM, .flags = I2C_DF_NOTIFY, - .attach_adapter = eeprom_attach_adapter, @@ -105,7 +111,8 @@ Index: linux-2.6.13-rc6+gregkh/drivers/i2c/chips/eeprom.c { struct i2c_client *new_client; Index: linux-2.6.13-rc6+gregkh/drivers/i2c/chips/m41t00.c -=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/i2c/chips/m41t00.c +=================================================================== +--- linux-2.6.13-rc6+gregkh.orig/drivers/i2c/chips/m41t00.c +++ linux-2.6.13-rc6+gregkh/drivers/i2c/chips/m41t00.c @@ -195,12 +195,6 @@ m41t00_probe(struct i2c_adapter *adap, i } @@ -120,7 +127,8 @@ Index: linux-2.6.13-rc6+gregkh/drivers/i2c/chips/m41t00.c m41t00_detach(struct i2c_client *client) { int rc; -@@ -217,7 +211,8 @@ static struct i2c_driver m41t00_driver .name = M41T00_DRV_NAME, +@@ -217,7 +211,8 @@ static struct i2c_driver m41t00_driver = + .name = M41T00_DRV_NAME, .id = I2C_DRIVERID_STM41T00, .flags = I2C_DF_NOTIFY, - .attach_adapter = m41t00_attach, @@ -130,7 +138,8 @@ Index: linux-2.6.13-rc6+gregkh/drivers/i2c/chips/m41t00.c }; Index: linux-2.6.13-rc6+gregkh/drivers/i2c/chips/max6875.c -=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/i2c/chips/max6875.c +=================================================================== +--- linux-2.6.13-rc6+gregkh.orig/drivers/i2c/chips/max6875.c +++ linux-2.6.13-rc6+gregkh/drivers/i2c/chips/max6875.c @@ -61,7 +61,6 @@ struct max6875_data { unsigned long last_updated[USER_EEPROM_SLICES]; @@ -164,7 +173,8 @@ Index: linux-2.6.13-rc6+gregkh/drivers/i2c/chips/max6875.c { struct i2c_client *real_client; Index: linux-2.6.13-rc6+gregkh/drivers/i2c/chips/pca9539.c -=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/i2c/chips/pca9539.c +=================================================================== +--- linux-2.6.13-rc6+gregkh.orig/drivers/i2c/chips/pca9539.c +++ linux-2.6.13-rc6+gregkh/drivers/i2c/chips/pca9539.c @@ -32,7 +32,6 @@ enum pca9539_cmd PCA9539_DIRECTION_1 = 7, @@ -198,7 +208,8 @@ Index: linux-2.6.13-rc6+gregkh/drivers/i2c/chips/pca9539.c { struct i2c_client *new_client; Index: linux-2.6.13-rc6+gregkh/drivers/i2c/chips/pcf8574.c -=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/i2c/chips/pcf8574.c +=================================================================== +--- linux-2.6.13-rc6+gregkh.orig/drivers/i2c/chips/pcf8574.c +++ linux-2.6.13-rc6+gregkh/drivers/i2c/chips/pcf8574.c @@ -58,7 +58,6 @@ struct pcf8574_data { u8 write; /* Remember last written value */ @@ -232,7 +243,8 @@ Index: linux-2.6.13-rc6+gregkh/drivers/i2c/chips/pcf8574.c { struct i2c_client *new_client; Index: linux-2.6.13-rc6+gregkh/drivers/i2c/chips/pcf8591.c -=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/i2c/chips/pcf8591.c +=================================================================== +--- linux-2.6.13-rc6+gregkh.orig/drivers/i2c/chips/pcf8591.c +++ linux-2.6.13-rc6+gregkh/drivers/i2c/chips/pcf8591.c @@ -80,7 +80,6 @@ struct pcf8591_data { u8 aout; @@ -266,7 +278,8 @@ Index: linux-2.6.13-rc6+gregkh/drivers/i2c/chips/pcf8591.c { struct i2c_client *new_client; Index: linux-2.6.13-rc6+gregkh/drivers/i2c/chips/rtc8564.c -=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/i2c/chips/rtc8564.c +=================================================================== +--- linux-2.6.13-rc6+gregkh.orig/drivers/i2c/chips/rtc8564.c +++ linux-2.6.13-rc6+gregkh/drivers/i2c/chips/rtc8564.c @@ -196,11 +196,6 @@ done: return ret; diff --git a/a/content_digest b/N1/content_digest index 54fec70..e4ea7a8 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020050815175106.GA24959@litech.org\0" - "From\0lutchann@litech.org (Nathan Lutchansky)\0" - "Subject\0[lm-sensors] [PATCH 3/5] remove attach_adapter from misc i2c chip\0" - "Date\0Mon, 15 Aug 2005 19:54:47 +0000\0" + "From\0Nathan Lutchansky <lutchann@litech.org>\0" + "Subject\0[PATCH 3/5] remove attach_adapter from misc i2c chip drivers\0" + "Date\0Mon, 15 Aug 2005 13:54:13 -0400\0" "To\0LKML <linux-kernel@vger.kernel.org>" " lm-sensors <lm-sensors@lm-sensors.org>\0" "Cc\0Greg KH <greg@kroah.com>\0" @@ -25,7 +25,8 @@ " 9 files changed, 18 insertions(+), 66 deletions(-)\n" "\n" "Index: linux-2.6.13-rc6+gregkh/drivers/i2c/chips/ds1337.c\n" - "=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/i2c/chips/ds1337.c\n" + "===================================================================\n" + "--- linux-2.6.13-rc6+gregkh.orig/drivers/i2c/chips/ds1337.c\n" "+++ linux-2.6.13-rc6+gregkh/drivers/i2c/chips/ds1337.c\n" "@@ -41,7 +41,6 @@ static unsigned short normal_i2c[] = { 0\n" " \n" @@ -35,7 +36,8 @@ " static int ds1337_detect(struct i2c_adapter *adapter, int address, int kind);\n" " static void ds1337_init_client(struct i2c_client *client);\n" " static int ds1337_detach_client(struct i2c_client *client);\n" - "@@ -55,7 +54,8 @@ static struct i2c_driver ds1337_driver \t.owner\t\t= THIS_MODULE,\n" + "@@ -55,7 +54,8 @@ static struct i2c_driver ds1337_driver =\n" + " \t.owner\t\t= THIS_MODULE,\n" " \t.name\t\t= \"ds1337\",\n" " \t.flags\t\t= I2C_DF_NOTIFY,\n" "-\t.attach_adapter\t= ds1337_attach_adapter,\n" @@ -57,7 +59,8 @@ " * The following function does more than just detection. If detection\n" " * succeeds, it also registers the new chip.\n" "Index: linux-2.6.13-rc6+gregkh/drivers/i2c/chips/ds1374.c\n" - "=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/i2c/chips/ds1374.c\n" + "===================================================================\n" + "--- linux-2.6.13-rc6+gregkh.orig/drivers/i2c/chips/ds1374.c\n" "+++ linux-2.6.13-rc6+gregkh/drivers/i2c/chips/ds1374.c\n" "@@ -216,11 +216,6 @@ static int ds1374_probe(struct i2c_adapt\n" " \treturn 0;\n" @@ -71,7 +74,8 @@ " static int ds1374_detach(struct i2c_client *client)\n" " {\n" " \tint rc;\n" - "@@ -237,7 +232,8 @@ static struct i2c_driver ds1374_driver \t.name = DS1374_DRV_NAME,\n" + "@@ -237,7 +232,8 @@ static struct i2c_driver ds1374_driver =\n" + " \t.name = DS1374_DRV_NAME,\n" " \t.id = I2C_DRIVERID_DS1374,\n" " \t.flags = I2C_DF_NOTIFY,\n" "-\t.attach_adapter = ds1374_attach,\n" @@ -81,7 +85,8 @@ " };\n" " \n" "Index: linux-2.6.13-rc6+gregkh/drivers/i2c/chips/eeprom.c\n" - "=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/i2c/chips/eeprom.c\n" + "===================================================================\n" + "--- linux-2.6.13-rc6+gregkh.orig/drivers/i2c/chips/eeprom.c\n" "+++ linux-2.6.13-rc6+gregkh/drivers/i2c/chips/eeprom.c\n" "@@ -62,7 +62,6 @@ struct eeprom_data {\n" " };\n" @@ -91,7 +96,8 @@ " static int eeprom_detect(struct i2c_adapter *adapter, int address, int kind);\n" " static int eeprom_detach_client(struct i2c_client *client);\n" " \n" - "@@ -72,7 +71,8 @@ static struct i2c_driver eeprom_driver \t.name\t\t= \"eeprom\",\n" + "@@ -72,7 +71,8 @@ static struct i2c_driver eeprom_driver =\n" + " \t.name\t\t= \"eeprom\",\n" " \t.id\t\t= I2C_DRIVERID_EEPROM,\n" " \t.flags\t\t= I2C_DF_NOTIFY,\n" "-\t.attach_adapter\t= eeprom_attach_adapter,\n" @@ -114,7 +120,8 @@ " {\n" " \tstruct i2c_client *new_client;\n" "Index: linux-2.6.13-rc6+gregkh/drivers/i2c/chips/m41t00.c\n" - "=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/i2c/chips/m41t00.c\n" + "===================================================================\n" + "--- linux-2.6.13-rc6+gregkh.orig/drivers/i2c/chips/m41t00.c\n" "+++ linux-2.6.13-rc6+gregkh/drivers/i2c/chips/m41t00.c\n" "@@ -195,12 +195,6 @@ m41t00_probe(struct i2c_adapter *adap, i\n" " }\n" @@ -129,7 +136,8 @@ " m41t00_detach(struct i2c_client *client)\n" " {\n" " \tint\trc;\n" - "@@ -217,7 +211,8 @@ static struct i2c_driver m41t00_driver \t.name\t\t= M41T00_DRV_NAME,\n" + "@@ -217,7 +211,8 @@ static struct i2c_driver m41t00_driver =\n" + " \t.name\t\t= M41T00_DRV_NAME,\n" " \t.id\t\t= I2C_DRIVERID_STM41T00,\n" " \t.flags\t\t= I2C_DF_NOTIFY,\n" "-\t.attach_adapter\t= m41t00_attach,\n" @@ -139,7 +147,8 @@ " };\n" " \n" "Index: linux-2.6.13-rc6+gregkh/drivers/i2c/chips/max6875.c\n" - "=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/i2c/chips/max6875.c\n" + "===================================================================\n" + "--- linux-2.6.13-rc6+gregkh.orig/drivers/i2c/chips/max6875.c\n" "+++ linux-2.6.13-rc6+gregkh/drivers/i2c/chips/max6875.c\n" "@@ -61,7 +61,6 @@ struct max6875_data {\n" " \tunsigned long\t\tlast_updated[USER_EEPROM_SLICES];\n" @@ -173,7 +182,8 @@ " {\n" " \tstruct i2c_client *real_client;\n" "Index: linux-2.6.13-rc6+gregkh/drivers/i2c/chips/pca9539.c\n" - "=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/i2c/chips/pca9539.c\n" + "===================================================================\n" + "--- linux-2.6.13-rc6+gregkh.orig/drivers/i2c/chips/pca9539.c\n" "+++ linux-2.6.13-rc6+gregkh/drivers/i2c/chips/pca9539.c\n" "@@ -32,7 +32,6 @@ enum pca9539_cmd\n" " \tPCA9539_DIRECTION_1\t= 7,\n" @@ -207,7 +217,8 @@ " {\n" " \tstruct i2c_client *new_client;\n" "Index: linux-2.6.13-rc6+gregkh/drivers/i2c/chips/pcf8574.c\n" - "=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/i2c/chips/pcf8574.c\n" + "===================================================================\n" + "--- linux-2.6.13-rc6+gregkh.orig/drivers/i2c/chips/pcf8574.c\n" "+++ linux-2.6.13-rc6+gregkh/drivers/i2c/chips/pcf8574.c\n" "@@ -58,7 +58,6 @@ struct pcf8574_data {\n" " \tu8 write;\t\t\t/* Remember last written value */\n" @@ -241,7 +252,8 @@ " {\n" " \tstruct i2c_client *new_client;\n" "Index: linux-2.6.13-rc6+gregkh/drivers/i2c/chips/pcf8591.c\n" - "=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/i2c/chips/pcf8591.c\n" + "===================================================================\n" + "--- linux-2.6.13-rc6+gregkh.orig/drivers/i2c/chips/pcf8591.c\n" "+++ linux-2.6.13-rc6+gregkh/drivers/i2c/chips/pcf8591.c\n" "@@ -80,7 +80,6 @@ struct pcf8591_data {\n" " \tu8 aout;\n" @@ -275,7 +287,8 @@ " {\n" " \tstruct i2c_client *new_client;\n" "Index: linux-2.6.13-rc6+gregkh/drivers/i2c/chips/rtc8564.c\n" - "=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/i2c/chips/rtc8564.c\n" + "===================================================================\n" + "--- linux-2.6.13-rc6+gregkh.orig/drivers/i2c/chips/rtc8564.c\n" "+++ linux-2.6.13-rc6+gregkh/drivers/i2c/chips/rtc8564.c\n" "@@ -196,11 +196,6 @@ done:\n" " \treturn ret;\n" @@ -300,4 +313,4 @@ " \t.command\t= rtc8564_command\n" }; -6ad10c2d3f5d724b2148d8f8648f52abe29a19f6d275025f4a40954b038da529 +4cf8e94a8b838e4166f347063dc99c8b7ac075e261dcb6dec91222b67596c8ef
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.