diff for duplicates of <20030323081431.GF26145@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 17e5c49..aa8014e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -8,7 +8,7 @@ diff -Nru a/drivers/media/video/adv7175.c b/drivers/media/video/adv7175.c +++ b/drivers/media/video/adv7175.c Sun Mar 23 00:11:01 2003 @@ -170,6 +170,7 @@ client=kmalloc(sizeof(*client), GFP_KERNEL); - if(client = NULL) + if(client == NULL) return -ENOMEM; + memset(client, 0, sizeof(*client)); @@ -59,7 +59,7 @@ diff -Nru a/drivers/media/video/adv7175.c b/drivers/media/video/adv7175.c { - struct adv7175 *encoder = client->data; + struct adv7175 *encoder = i2c_get_clientdata(client); - int i, x_ntsc\x13, x_pal\x13; + int i, x_ntsc=13, x_pal=13; /* x_ntsc is number of entries in init_ntsc -1 */ /* x_pal is number of entries in init_pal -1 */ @@ -297,7 +299,7 @@ @@ -107,7 +107,7 @@ diff -Nru a/drivers/media/video/bt819.c b/drivers/media/video/bt819.c init[3 * 2 - 1] = (((timing->vdelay >> 8) & 0x03) << 6) | @@ -159,6 +159,7 @@ client = kmalloc(sizeof(*client), GFP_KERNEL); - if(client = NULL) + if(client == NULL) return -ENOMEM; + memset(client, 0, sizeof(*client)); client_template.adapter = adap; @@ -171,7 +171,7 @@ diff -Nru a/drivers/media/video/bt819.c b/drivers/media/video/bt819.c - decoder->client->name, *iarg)); + decoder->client->dev.name, *iarg)); - if (*iarg = VIDEO_MODE_NTSC) { + if (*iarg == VIDEO_MODE_NTSC) { bt819_setbit(decoder, 0x01, 0, 1); @@ -319,7 +320,7 @@ int *iarg = arg; @@ -228,7 +228,7 @@ diff -Nru a/drivers/media/video/bt856.c b/drivers/media/video/bt856.c +++ b/drivers/media/video/bt856.c Sun Mar 23 00:11:01 2003 @@ -106,6 +106,7 @@ client = kmalloc(sizeof(*client), GFP_KERNEL); - if(client = NULL) + if(client == NULL) return -ENOMEM; + memset(client, 0, sizeof(*client)); client_template.adapter = adap; @@ -412,7 +412,7 @@ diff -Nru a/drivers/media/video/msp3400.c b/drivers/media/video/msp3400.c - struct msp3400c *msp = client->data; + struct msp3400c *msp = i2c_get_clientdata(client); - if (-1 = scarts[out][in]) + if (-1 == scarts[out][in]) return; @@ -411,7 +411,7 @@ @@ -498,7 +498,7 @@ diff -Nru a/drivers/media/video/msp3400.c b/drivers/media/video/msp3400.c + i2c_set_clientdata(c, msp); init_waitqueue_head(&msp->wq); - if (-1 = msp3400c_reset(c)) { + if (-1 == msp3400c_reset(c)) { @@ -1291,7 +1293,7 @@ #endif msp3400c_setvolume(c,msp->muted,msp->left,msp->right); @@ -561,7 +561,7 @@ diff -Nru a/drivers/media/video/saa5249.c b/drivers/media/video/saa5249.c - client->data = vd=(struct video_device *)kmalloc(sizeof(struct video_device), GFP_KERNEL); + vd = (struct video_device *)kmalloc(sizeof(struct video_device), GFP_KERNEL); - if(vd=NULL) + if(vd==NULL) { kfree(t); kfree(client); @@ -599,7 +599,7 @@ diff -Nru a/drivers/media/video/saa7110.c b/drivers/media/video/saa7110.c +++ b/drivers/media/video/saa7110.c Sun Mar 23 00:11:01 2003 @@ -163,6 +163,7 @@ client=kmalloc(sizeof(*client), GFP_KERNEL); - if(client = NULL) + if(client == NULL) return -ENOMEM; + memset(client, 0, sizeof(*client)); client_template.adapter = adap; @@ -672,7 +672,7 @@ diff -Nru a/drivers/media/video/saa7111.c b/drivers/media/video/saa7111.c +++ b/drivers/media/video/saa7111.c Sun Mar 23 00:11:01 2003 @@ -120,6 +120,7 @@ client = kmalloc(sizeof(*client), GFP_KERNEL); - if(client = NULL) + if(client == NULL) return -ENOMEM; + memset(client, 0, sizeof(*client)); client_template.adapter = adap; @@ -783,7 +783,7 @@ diff -Nru a/drivers/media/video/saa7185.c b/drivers/media/video/saa7185.c +++ b/drivers/media/video/saa7185.c Sun Mar 23 00:11:01 2003 @@ -191,6 +191,7 @@ client = kmalloc(sizeof(*client), GFP_KERNEL); - if (client = NULL) + if (client == NULL) return -ENOMEM; + memset(client, 0, sizeof(*client)); client_template.adapter = adap; @@ -902,7 +902,8 @@ diff -Nru a/drivers/media/video/tda7432.c b/drivers/media/video/tda7432.c switch (cmd) { @@ -526,9 +526,11 @@ - static struct i2c_client client_template { + static struct i2c_client client_template = + { - .name = "tda7432", .id = -1, .driver = &driver, @@ -971,7 +972,8 @@ diff -Nru a/drivers/media/video/tda9875.c b/drivers/media/video/tda9875.c @@ -396,9 +396,11 @@ - static struct i2c_client client_template { + static struct i2c_client client_template = + { - .name = "tda9875", .id = -1, .driver = &driver, @@ -1028,7 +1030,8 @@ diff -Nru a/drivers/media/video/tda9887.c b/drivers/media/video/tda9887.c @@ -456,9 +456,11 @@ }; - static struct i2c_client client_template { + static struct i2c_client client_template = + { - .name = "tda9887", .flags = I2C_CLIENT_ALLOW_USE, .driver = &driver, @@ -1043,7 +1046,8 @@ diff -Nru a/drivers/media/video/tuner-3036.c b/drivers/media/video/tuner-3036.c +++ b/drivers/media/video/tuner-3036.c Sun Mar 23 00:11:01 2003 @@ -196,9 +196,11 @@ - static struct i2c_client client_template { + static struct i2c_client client_template = + { - .name = "SAB3036", .id = -1, - .driver = &i2c_driver_tuner @@ -1064,7 +1068,7 @@ diff -Nru a/drivers/media/video/tuner.c b/drivers/media/video/tuner.c - struct tuner *t = (struct tuner*)c->data; + struct tuner *t = i2c_get_clientdata(c); - if (t->type = TUNER_MT2032) + if (t->type == TUNER_MT2032) return 0; @@ -276,7 +276,7 @@ { @@ -1103,12 +1107,12 @@ diff -Nru a/drivers/media/video/tuner.c b/drivers/media/video/tuner.c int rc,div; @@ -794,16 +794,17 @@ - if (NULL = (client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL))) + if (NULL == (client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL))) return -ENOMEM; memcpy(client,&client_template,sizeof(struct i2c_client)); - client->data = t = kmalloc(sizeof(struct tuner),GFP_KERNEL); + t = kmalloc(sizeof(struct tuner),GFP_KERNEL); - if (NULL = t) { + if (NULL == t) { kfree(client); return -ENOMEM; } @@ -1161,12 +1165,13 @@ diff -Nru a/drivers/media/video/tuner.c b/drivers/media/video/tuner.c t->type,tuners[t->type].name); - strncpy(client->name, tuners[t->type].name, sizeof(client->name)); + strncpy(client->dev.name, tuners[t->type].name, DEVICE_NAME_SIZE); - if (t->type = TUNER_MT2032) + if (t->type == TUNER_MT2032) mt2032_init(client); break; @@ -977,9 +978,11 @@ }; - static struct i2c_client client_template { + static struct i2c_client client_template = + { - .name = "(tuner unset)", .flags = I2C_CLIENT_ALLOW_USE, .driver = &driver, @@ -1182,7 +1187,7 @@ diff -Nru a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c @@ -161,22 +161,22 @@ unsigned char buffer[2]; - if (-1 = subaddr) { + if (-1 == subaddr) { - dprintk("%s: chip_write: 0x%x\n", chip->c.name, val); + dprintk("%s: chip_write: 0x%x\n", chip->c.dev.name, val); chip->shadow.bytes[1] = val; @@ -1284,7 +1289,7 @@ diff -Nru a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c up(chip->notify); @@ -316,7 +316,7 @@ - if (mode = chip->prevmode) + if (mode == chip->prevmode) return; - dprintk("%s: thread checkmode\n", chip->c.name); @@ -1334,7 +1339,8 @@ diff -Nru a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c case AUDC_SET_INPUT: @@ -1558,9 +1558,11 @@ - static struct i2c_client client_template { + static struct i2c_client client_template = + { - .name = "(unset)", .flags = I2C_CLIENT_ALLOW_USE, .driver = &driver, diff --git a/a/content_digest b/N1/content_digest index 2bcadec..fda349f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020030323080719.GD26145@kroah.com\0" - "From\0greg@kroah.com (Greg KH)\0" + "From\0Greg KH <greg@kroah.com>\0" "Subject\0[PATCH] Yet more i2c driver changes for 2.5.65\0" - "Date\0Thu, 19 May 2005 06:23:51 +0000\0" + "Date\0Sun, 23 Mar 2003 00:14:31 -0800\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "\00:1\0" @@ -16,7 +16,7 @@ "+++ b/drivers/media/video/adv7175.c\tSun Mar 23 00:11:01 2003\n" "@@ -170,6 +170,7 @@\n" " \tclient=kmalloc(sizeof(*client), GFP_KERNEL);\n" - " \tif(client = NULL)\n" + " \tif(client == NULL)\n" " \t\treturn -ENOMEM;\n" "+\tmemset(client, 0, sizeof(*client));\n" " \n" @@ -67,7 +67,7 @@ " {\n" "-\tstruct adv7175 *encoder = client->data;\n" "+\tstruct adv7175 *encoder = i2c_get_clientdata(client);\n" - " \tint i, x_ntsc\023, x_pal\023; \n" + " \tint i, x_ntsc=13, x_pal=13; \n" " \t\t/* x_ntsc is number of entries in init_ntsc -1 */\n" " \t\t/* x_pal is number of entries in init_pal -1 */\n" "@@ -297,7 +299,7 @@\n" @@ -115,7 +115,7 @@ " \tinit[3 * 2 - 1] = (((timing->vdelay >> 8) & 0x03) << 6) |\n" "@@ -159,6 +159,7 @@\n" " \tclient = kmalloc(sizeof(*client), GFP_KERNEL);\n" - " \tif(client = NULL)\n" + " \tif(client == NULL)\n" " \t\treturn -ENOMEM;\n" "+\tmemset(client, 0, sizeof(*client));\n" " \tclient_template.adapter = adap;\n" @@ -179,7 +179,7 @@ "-\t\t\t\t decoder->client->name, *iarg));\n" "+\t\t\t\t decoder->client->dev.name, *iarg));\n" " \n" - " \t\t\tif (*iarg = VIDEO_MODE_NTSC) {\n" + " \t\t\tif (*iarg == VIDEO_MODE_NTSC) {\n" " \t\t\t\tbt819_setbit(decoder, 0x01, 0, 1);\n" "@@ -319,7 +320,7 @@\n" " \t\t\tint *iarg = arg;\n" @@ -236,7 +236,7 @@ "+++ b/drivers/media/video/bt856.c\tSun Mar 23 00:11:01 2003\n" "@@ -106,6 +106,7 @@\n" " \tclient = kmalloc(sizeof(*client), GFP_KERNEL);\n" - " \tif(client = NULL)\n" + " \tif(client == NULL)\n" " \t\treturn -ENOMEM;\n" "+\tmemset(client, 0, sizeof(*client));\n" " \tclient_template.adapter = adap;\n" @@ -420,7 +420,7 @@ "-\tstruct msp3400c *msp = client->data;\n" "+\tstruct msp3400c *msp = i2c_get_clientdata(client);\n" " \n" - " \tif (-1 = scarts[out][in])\n" + " \tif (-1 == scarts[out][in])\n" " \t\treturn;\n" "@@ -411,7 +411,7 @@\n" " \n" @@ -506,7 +506,7 @@ "+\ti2c_set_clientdata(c, msp);\n" " \tinit_waitqueue_head(&msp->wq);\n" " \n" - " \tif (-1 = msp3400c_reset(c)) {\n" + " \tif (-1 == msp3400c_reset(c)) {\n" "@@ -1291,7 +1293,7 @@\n" " #endif\n" " \tmsp3400c_setvolume(c,msp->muted,msp->left,msp->right);\n" @@ -569,7 +569,7 @@ " \t \n" "-\tclient->data = vd=(struct video_device *)kmalloc(sizeof(struct video_device), GFP_KERNEL);\n" "+\tvd = (struct video_device *)kmalloc(sizeof(struct video_device), GFP_KERNEL);\n" - " \tif(vd=NULL)\n" + " \tif(vd==NULL)\n" " \t{\n" " \t\tkfree(t);\n" " \t\tkfree(client);\n" @@ -607,7 +607,7 @@ "+++ b/drivers/media/video/saa7110.c\tSun Mar 23 00:11:01 2003\n" "@@ -163,6 +163,7 @@\n" " \tclient=kmalloc(sizeof(*client), GFP_KERNEL);\n" - " \tif(client = NULL) \n" + " \tif(client == NULL) \n" " \t\treturn -ENOMEM;\n" "+\tmemset(client, 0, sizeof(*client));\n" " \tclient_template.adapter = adap;\n" @@ -680,7 +680,7 @@ "+++ b/drivers/media/video/saa7111.c\tSun Mar 23 00:11:01 2003\n" "@@ -120,6 +120,7 @@\n" " \tclient = kmalloc(sizeof(*client), GFP_KERNEL);\n" - " \tif(client = NULL) \n" + " \tif(client == NULL) \n" " \t\treturn -ENOMEM;\n" "+\tmemset(client, 0, sizeof(*client));\n" " \tclient_template.adapter = adap;\n" @@ -791,7 +791,7 @@ "+++ b/drivers/media/video/saa7185.c\tSun Mar 23 00:11:01 2003\n" "@@ -191,6 +191,7 @@\n" " \tclient = kmalloc(sizeof(*client), GFP_KERNEL);\n" - " \tif (client = NULL)\n" + " \tif (client == NULL)\n" " \t\treturn -ENOMEM;\n" "+\tmemset(client, 0, sizeof(*client));\n" " \tclient_template.adapter = adap;\n" @@ -910,7 +910,8 @@ " \tswitch (cmd) {\n" "@@ -526,9 +526,11 @@\n" " \n" - " static struct i2c_client client_template {\n" + " static struct i2c_client client_template =\n" + " {\n" "- .name = \"tda7432\",\n" " .id = -1,\n" " \t.driver = &driver, \n" @@ -979,7 +980,8 @@ " \n" "@@ -396,9 +396,11 @@\n" " \n" - " static struct i2c_client client_template {\n" + " static struct i2c_client client_template =\n" + " {\n" "- .name = \"tda9875\",\n" " .id = -1,\n" " .driver = &driver,\n" @@ -1036,7 +1038,8 @@ " \n" "@@ -456,9 +456,11 @@\n" " };\n" - " static struct i2c_client client_template {\n" + " static struct i2c_client client_template =\n" + " {\n" "- .name = \"tda9887\",\n" " \t.flags = I2C_CLIENT_ALLOW_USE,\n" " .driver = &driver,\n" @@ -1051,7 +1054,8 @@ "+++ b/drivers/media/video/tuner-3036.c\tSun Mar 23 00:11:01 2003\n" "@@ -196,9 +196,11 @@\n" " \n" - " static struct i2c_client client_template {\n" + " static struct i2c_client client_template =\n" + " {\n" "- .name \t\t= \"SAB3036\",\n" " .id \t\t= -1,\n" "- .driver\t\t= &i2c_driver_tuner\n" @@ -1072,7 +1076,7 @@ "-\tstruct tuner *t = (struct tuner*)c->data;\n" "+\tstruct tuner *t = i2c_get_clientdata(c);\n" " \n" - " if (t->type = TUNER_MT2032)\n" + " if (t->type == TUNER_MT2032)\n" " \t\treturn 0;\n" "@@ -276,7 +276,7 @@\n" " {\n" @@ -1111,12 +1115,12 @@ " \tint rc,div;\n" " \n" "@@ -794,16 +794,17 @@\n" - " if (NULL = (client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL)))\n" + " if (NULL == (client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL)))\n" " return -ENOMEM;\n" " memcpy(client,&client_template,sizeof(struct i2c_client));\n" "- client->data = t = kmalloc(sizeof(struct tuner),GFP_KERNEL);\n" "+ t = kmalloc(sizeof(struct tuner),GFP_KERNEL);\n" - " if (NULL = t) {\n" + " if (NULL == t) {\n" " kfree(client);\n" " return -ENOMEM;\n" " }\n" @@ -1169,12 +1173,13 @@ " t->type,tuners[t->type].name);\n" "-\t\tstrncpy(client->name, tuners[t->type].name, sizeof(client->name));\n" "+\t\tstrncpy(client->dev.name, tuners[t->type].name, DEVICE_NAME_SIZE);\n" - " \t\tif (t->type = TUNER_MT2032)\n" + " \t\tif (t->type == TUNER_MT2032)\n" " mt2032_init(client);\n" " \t\tbreak;\n" "@@ -977,9 +978,11 @@\n" " };\n" - " static struct i2c_client client_template {\n" + " static struct i2c_client client_template =\n" + " {\n" "- .name = \"(tuner unset)\",\n" " \t.flags = I2C_CLIENT_ALLOW_USE,\n" " .driver = &driver,\n" @@ -1190,7 +1195,7 @@ "@@ -161,22 +161,22 @@\n" " \tunsigned char buffer[2];\n" " \n" - " \tif (-1 = subaddr) {\n" + " \tif (-1 == subaddr) {\n" "-\t\tdprintk(\"%s: chip_write: 0x%x\\n\", chip->c.name, val);\n" "+\t\tdprintk(\"%s: chip_write: 0x%x\\n\", chip->c.dev.name, val);\n" " \t\tchip->shadow.bytes[1] = val;\n" @@ -1292,7 +1297,7 @@ " \t\tup(chip->notify);\n" " \n" "@@ -316,7 +316,7 @@\n" - " \tif (mode = chip->prevmode)\n" + " \tif (mode == chip->prevmode)\n" " \t return;\n" " \n" "-\tdprintk(\"%s: thread checkmode\\n\", chip->c.name);\n" @@ -1342,7 +1347,8 @@ " \tcase AUDC_SET_INPUT:\n" "@@ -1558,9 +1558,11 @@\n" " \n" - " static struct i2c_client client_template {\n" + " static struct i2c_client client_template =\n" + " {\n" "- .name = \"(unset)\",\n" " \t.flags = I2C_CLIENT_ALLOW_USE,\n" " .driver = &driver,\n" @@ -1353,4 +1359,4 @@ " \n" static int audiochip_init_module(void) -03a71083446b3451fd065b3753d42eaeb1049493fd24fc58fd224792848f02d4 +802ec8a4247403d6bb9bf19a4fcb20605b068549dccdc9e11fc54f720c84107d
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.