diff for duplicates of <11099685932577@kroah.com> diff --git a/a/1.txt b/N1/1.txt index fc886d6..8a05ee7 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -81,8 +81,8 @@ diff -Nru a/drivers/media/video/adv7170.c b/drivers/media/video/adv7170.c client->driver = &i2c_driver_adv7170; client->flags = I2C_CLIENT_ALLOW_USE; - client->id = adv7170_i2c_id++; - if ((client->addr = I2C_ADV7170 >> 1) || - (client->addr = (I2C_ADV7170 >> 1) + 1)) { + if ((client->addr == I2C_ADV7170 >> 1) || + (client->addr == (I2C_ADV7170 >> 1) + 1)) { dname = adv7170_name; @@ -444,8 +442,7 @@ kfree(client); @@ -93,7 +93,7 @@ diff -Nru a/drivers/media/video/adv7170.c b/drivers/media/video/adv7170.c + strlcpy(I2C_NAME(client), dname, sizeof(I2C_NAME(client))); encoder = kmalloc(sizeof(struct adv7170), GFP_KERNEL); - if (encoder = NULL) { + if (encoder == NULL) { diff -Nru a/drivers/media/video/adv7175.c b/drivers/media/video/adv7175.c --- a/drivers/media/video/adv7175.c 2005-03-04 12:26:18 -08:00 +++ b/drivers/media/video/adv7175.c 2005-03-04 12:26:18 -08:00 @@ -110,8 +110,8 @@ diff -Nru a/drivers/media/video/adv7175.c b/drivers/media/video/adv7175.c client->driver = &i2c_driver_adv7175; client->flags = I2C_CLIENT_ALLOW_USE; - client->id = adv7175_i2c_id++; - if ((client->addr = I2C_ADV7175 >> 1) || - (client->addr = (I2C_ADV7175 >> 1) + 1)) { + if ((client->addr == I2C_ADV7175 >> 1) || + (client->addr == (I2C_ADV7175 >> 1) + 1)) { dname = adv7175_name; @@ -494,8 +492,7 @@ kfree(client); @@ -122,7 +122,7 @@ diff -Nru a/drivers/media/video/adv7175.c b/drivers/media/video/adv7175.c + strlcpy(I2C_NAME(client), dname, sizeof(I2C_NAME(client))); encoder = kmalloc(sizeof(struct adv7175), GFP_KERNEL); - if (encoder = NULL) { + if (encoder == NULL) { diff -Nru a/drivers/media/video/bt819.c b/drivers/media/video/bt819.c --- a/drivers/media/video/bt819.c 2005-03-04 12:26:18 -08:00 +++ b/drivers/media/video/bt819.c 2005-03-04 12:26:18 -08:00 @@ -141,7 +141,7 @@ diff -Nru a/drivers/media/video/bt819.c b/drivers/media/video/bt819.c - client->id = bt819_i2c_id++; decoder = kmalloc(sizeof(struct bt819), GFP_KERNEL); - if (decoder = NULL) { + if (decoder == NULL) { @@ -568,16 +566,13 @@ id = bt819_read(client, 0x17); switch (id & 0xf0) { @@ -183,7 +183,7 @@ diff -Nru a/drivers/media/video/bt856.c b/drivers/media/video/bt856.c + strlcpy(I2C_NAME(client), "bt856", sizeof(I2C_NAME(client))); encoder = kmalloc(sizeof(struct bt856), GFP_KERNEL); - if (encoder = NULL) { + if (encoder == NULL) { diff -Nru a/drivers/media/video/bttv-i2c.c b/drivers/media/video/bttv-i2c.c --- a/drivers/media/video/bttv-i2c.c 2005-03-04 12:26:18 -08:00 +++ b/drivers/media/video/bttv-i2c.c 2005-03-04 12:26:18 -08:00 @@ -260,7 +260,7 @@ diff -Nru a/drivers/media/video/saa7110.c b/drivers/media/video/saa7110.c + strlcpy(I2C_NAME(client), "saa7110", sizeof(I2C_NAME(client))); decoder = kmalloc(sizeof(struct saa7110), GFP_KERNEL); - if (decoder = 0) { + if (decoder == 0) { diff -Nru a/drivers/media/video/saa7111.c b/drivers/media/video/saa7111.c --- a/drivers/media/video/saa7111.c 2005-03-04 12:26:18 -08:00 +++ b/drivers/media/video/saa7111.c 2005-03-04 12:26:18 -08:00 @@ -282,7 +282,7 @@ diff -Nru a/drivers/media/video/saa7111.c b/drivers/media/video/saa7111.c + strlcpy(I2C_NAME(client), "saa7111", sizeof(I2C_NAME(client))); decoder = kmalloc(sizeof(struct saa7111), GFP_KERNEL); - if (decoder = NULL) { + if (decoder == NULL) { diff -Nru a/drivers/media/video/saa7114.c b/drivers/media/video/saa7114.c --- a/drivers/media/video/saa7114.c 2005-03-04 12:26:18 -08:00 +++ b/drivers/media/video/saa7114.c 2005-03-04 12:26:18 -08:00 @@ -304,7 +304,7 @@ diff -Nru a/drivers/media/video/saa7114.c b/drivers/media/video/saa7114.c + strlcpy(I2C_NAME(client), "saa7114", sizeof(I2C_NAME(client))); decoder = kmalloc(sizeof(struct saa7114), GFP_KERNEL); - if (decoder = NULL) { + if (decoder == NULL) { diff -Nru a/drivers/media/video/saa7134/saa7134-i2c.c b/drivers/media/video/saa7134/saa7134-i2c.c --- a/drivers/media/video/saa7134/saa7134-i2c.c 2005-03-04 12:26:18 -08:00 +++ b/drivers/media/video/saa7134/saa7134-i2c.c 2005-03-04 12:26:18 -08:00 @@ -337,12 +337,13 @@ diff -Nru a/drivers/media/video/saa7185.c b/drivers/media/video/saa7185.c + strlcpy(I2C_NAME(client), "saa7185", sizeof(I2C_NAME(client))); encoder = kmalloc(sizeof(struct saa7185), GFP_KERNEL); - if (encoder = NULL) { + if (encoder == NULL) { diff -Nru a/drivers/media/video/tda7432.c b/drivers/media/video/tda7432.c --- a/drivers/media/video/tda7432.c 2005-03-04 12:26:18 -08:00 +++ b/drivers/media/video/tda7432.c 2005-03-04 12:26:18 -08:00 @@ -528,7 +528,6 @@ - static struct i2c_client client_template { + static struct i2c_client client_template = + { I2C_DEVNAME("tda7432"), - .id = -1, .driver = &driver, @@ -373,7 +374,8 @@ diff -Nru a/drivers/media/video/tda9875.c b/drivers/media/video/tda9875.c --- a/drivers/media/video/tda9875.c 2005-03-04 12:26:18 -08:00 +++ b/drivers/media/video/tda9875.c 2005-03-04 12:26:18 -08:00 @@ -399,7 +399,6 @@ - static struct i2c_client client_template { + static struct i2c_client client_template = + { I2C_DEVNAME("tda9875"), - .id = -1, .driver = &driver, @@ -426,7 +428,8 @@ diff -Nru a/drivers/media/video/tuner-3036.c b/drivers/media/video/tuner-3036.c +++ b/drivers/media/video/tuner-3036.c 2005-03-04 12:26:18 -08:00 @@ -192,7 +192,6 @@ - static struct i2c_client client_template { + static struct i2c_client client_template = + { - .id = -1, .driver = &i2c_driver_tuner, .name = "SAB3036", diff --git a/a/content_digest b/N1/content_digest index ac54a05..2152041 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\011099685933551@kroah.com\0" - "From\0greg@kroah.com (Greg KH)\0" + "From\0Greg KH <greg@kroah.com>\0" "Subject\0[PATCH] I2C: Kill i2c_client.id (2/5)\0" - "Date\0Thu, 19 May 2005 06:25:41 +0000\0" + "Date\0Fri, 4 Mar 2005 12:36:33 -0800\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "Cc\0khali@linux-fr.org\0" @@ -90,8 +90,8 @@ " \tclient->driver = &i2c_driver_adv7170;\n" " \tclient->flags = I2C_CLIENT_ALLOW_USE;\n" "-\tclient->id = adv7170_i2c_id++;\n" - " \tif ((client->addr = I2C_ADV7170 >> 1) ||\n" - " \t (client->addr = (I2C_ADV7170 >> 1) + 1)) {\n" + " \tif ((client->addr == I2C_ADV7170 >> 1) ||\n" + " \t (client->addr == (I2C_ADV7170 >> 1) + 1)) {\n" " \t\tdname = adv7170_name;\n" "@@ -444,8 +442,7 @@\n" " \t\tkfree(client);\n" @@ -102,7 +102,7 @@ "+\tstrlcpy(I2C_NAME(client), dname, sizeof(I2C_NAME(client)));\n" " \n" " \tencoder = kmalloc(sizeof(struct adv7170), GFP_KERNEL);\n" - " \tif (encoder = NULL) {\n" + " \tif (encoder == NULL) {\n" "diff -Nru a/drivers/media/video/adv7175.c b/drivers/media/video/adv7175.c\n" "--- a/drivers/media/video/adv7175.c\t2005-03-04 12:26:18 -08:00\n" "+++ b/drivers/media/video/adv7175.c\t2005-03-04 12:26:18 -08:00\n" @@ -119,8 +119,8 @@ " \tclient->driver = &i2c_driver_adv7175;\n" " \tclient->flags = I2C_CLIENT_ALLOW_USE;\n" "-\tclient->id = adv7175_i2c_id++;\n" - " \tif ((client->addr = I2C_ADV7175 >> 1) ||\n" - " \t (client->addr = (I2C_ADV7175 >> 1) + 1)) {\n" + " \tif ((client->addr == I2C_ADV7175 >> 1) ||\n" + " \t (client->addr == (I2C_ADV7175 >> 1) + 1)) {\n" " \t\tdname = adv7175_name;\n" "@@ -494,8 +492,7 @@\n" " \t\tkfree(client);\n" @@ -131,7 +131,7 @@ "+\tstrlcpy(I2C_NAME(client), dname, sizeof(I2C_NAME(client)));\n" " \n" " \tencoder = kmalloc(sizeof(struct adv7175), GFP_KERNEL);\n" - " \tif (encoder = NULL) {\n" + " \tif (encoder == NULL) {\n" "diff -Nru a/drivers/media/video/bt819.c b/drivers/media/video/bt819.c\n" "--- a/drivers/media/video/bt819.c\t2005-03-04 12:26:18 -08:00\n" "+++ b/drivers/media/video/bt819.c\t2005-03-04 12:26:18 -08:00\n" @@ -150,7 +150,7 @@ "-\tclient->id = bt819_i2c_id++;\n" " \n" " \tdecoder = kmalloc(sizeof(struct bt819), GFP_KERNEL);\n" - " \tif (decoder = NULL) {\n" + " \tif (decoder == NULL) {\n" "@@ -568,16 +566,13 @@\n" " \tid = bt819_read(client, 0x17);\n" " \tswitch (id & 0xf0) {\n" @@ -192,7 +192,7 @@ "+\tstrlcpy(I2C_NAME(client), \"bt856\", sizeof(I2C_NAME(client)));\n" " \n" " \tencoder = kmalloc(sizeof(struct bt856), GFP_KERNEL);\n" - " \tif (encoder = NULL) {\n" + " \tif (encoder == NULL) {\n" "diff -Nru a/drivers/media/video/bttv-i2c.c b/drivers/media/video/bttv-i2c.c\n" "--- a/drivers/media/video/bttv-i2c.c\t2005-03-04 12:26:18 -08:00\n" "+++ b/drivers/media/video/bttv-i2c.c\t2005-03-04 12:26:18 -08:00\n" @@ -269,7 +269,7 @@ "+\tstrlcpy(I2C_NAME(client), \"saa7110\", sizeof(I2C_NAME(client)));\n" " \n" " \tdecoder = kmalloc(sizeof(struct saa7110), GFP_KERNEL);\n" - " \tif (decoder = 0) {\n" + " \tif (decoder == 0) {\n" "diff -Nru a/drivers/media/video/saa7111.c b/drivers/media/video/saa7111.c\n" "--- a/drivers/media/video/saa7111.c\t2005-03-04 12:26:18 -08:00\n" "+++ b/drivers/media/video/saa7111.c\t2005-03-04 12:26:18 -08:00\n" @@ -291,7 +291,7 @@ "+\tstrlcpy(I2C_NAME(client), \"saa7111\", sizeof(I2C_NAME(client)));\n" " \n" " \tdecoder = kmalloc(sizeof(struct saa7111), GFP_KERNEL);\n" - " \tif (decoder = NULL) {\n" + " \tif (decoder == NULL) {\n" "diff -Nru a/drivers/media/video/saa7114.c b/drivers/media/video/saa7114.c\n" "--- a/drivers/media/video/saa7114.c\t2005-03-04 12:26:18 -08:00\n" "+++ b/drivers/media/video/saa7114.c\t2005-03-04 12:26:18 -08:00\n" @@ -313,7 +313,7 @@ "+\tstrlcpy(I2C_NAME(client), \"saa7114\", sizeof(I2C_NAME(client)));\n" " \n" " \tdecoder = kmalloc(sizeof(struct saa7114), GFP_KERNEL);\n" - " \tif (decoder = NULL) {\n" + " \tif (decoder == NULL) {\n" "diff -Nru a/drivers/media/video/saa7134/saa7134-i2c.c b/drivers/media/video/saa7134/saa7134-i2c.c\n" "--- a/drivers/media/video/saa7134/saa7134-i2c.c\t2005-03-04 12:26:18 -08:00\n" "+++ b/drivers/media/video/saa7134/saa7134-i2c.c\t2005-03-04 12:26:18 -08:00\n" @@ -346,12 +346,13 @@ "+\tstrlcpy(I2C_NAME(client), \"saa7185\", sizeof(I2C_NAME(client)));\n" " \n" " \tencoder = kmalloc(sizeof(struct saa7185), GFP_KERNEL);\n" - " \tif (encoder = NULL) {\n" + " \tif (encoder == NULL) {\n" "diff -Nru a/drivers/media/video/tda7432.c b/drivers/media/video/tda7432.c\n" "--- a/drivers/media/video/tda7432.c\t2005-03-04 12:26:18 -08:00\n" "+++ b/drivers/media/video/tda7432.c\t2005-03-04 12:26:18 -08:00\n" "@@ -528,7 +528,6 @@\n" - " static struct i2c_client client_template {\n" + " static struct i2c_client client_template =\n" + " {\n" " \tI2C_DEVNAME(\"tda7432\"),\n" "- .id = -1,\n" " \t.driver = &driver,\n" @@ -382,7 +383,8 @@ "--- a/drivers/media/video/tda9875.c\t2005-03-04 12:26:18 -08:00\n" "+++ b/drivers/media/video/tda9875.c\t2005-03-04 12:26:18 -08:00\n" "@@ -399,7 +399,6 @@\n" - " static struct i2c_client client_template {\n" + " static struct i2c_client client_template =\n" + " {\n" " I2C_DEVNAME(\"tda9875\"),\n" "- .id = -1,\n" " .driver = &driver,\n" @@ -435,7 +437,8 @@ "+++ b/drivers/media/video/tuner-3036.c\t2005-03-04 12:26:18 -08:00\n" "@@ -192,7 +192,6 @@\n" " \n" - " static struct i2c_client client_template {\n" + " static struct i2c_client client_template =\n" + " {\n" "- .id \t\t= -1,\n" " .driver\t\t= &i2c_driver_tuner,\n" " \t.name\t\t= \"SAB3036\",\n" @@ -495,4 +498,4 @@ " \n" " \tdecoder = kmalloc(sizeof(struct vpx3220), GFP_KERNEL);" -81e3696b36db129406603d73aa2857416a7f0628704321d1b09ba613107379a1 +36b0eb9db936b53b9f775f8ff32973971ed6b776ee9b3a4817f35f0d56b27f20
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.