diff for duplicates of <10522676142536@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 11eb580..e2d9fa5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -53,9 +53,9 @@ diff -Nru a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c down(&core_lists); - for (i = 0; i < I2C_ADAP_MAX; i++) -- if (NULL = adapters[i]) +- if (NULL == adapters[i]) - break; -- if (I2C_ADAP_MAX = i) { +- if (I2C_ADAP_MAX == i) { - dev_warn(&adap->dev, - "register_adapter - enlarge I2C_ADAP_MAX.\n"); - res = -ENOMEM; @@ -76,7 +76,7 @@ diff -Nru a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c * If the parent pointer is not set up, @@ -99,77 +93,65 @@ */ - if (adap->dev.parent = NULL) + if (adap->dev.parent == NULL) adap->dev.parent = &legacy_bus; - sprintf(adap->dev.bus_id, "i2c-%d", i); + sprintf(adap->dev.bus_id, "i2c-%d", adap->nr); @@ -116,9 +116,9 @@ diff -Nru a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c down(&core_lists); - for (i = 0; i < I2C_ADAP_MAX; i++) -- if (adap = adapters[i]) +- if (adap == adapters[i]) - break; -- if (I2C_ADAP_MAX = i) { +- if (I2C_ADAP_MAX == i) { - dev_warn(&adap->dev, "unregister_adapter adap not found.\n"); - res = -ENODEV; - goto out_unlock; @@ -196,9 +196,9 @@ diff -Nru a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c down(&core_lists); - for (i = 0; i < I2C_DRIVER_MAX; i++) -- if (NULL = drivers[i]) +- if (NULL == drivers[i]) - break; -- if (I2C_DRIVER_MAX = i) { +- if (I2C_DRIVER_MAX == i) { - printk(KERN_WARNING - " i2c-core.o: register_driver(%s) " - "- enlarge I2C_DRIVER_MAX.\n", @@ -249,9 +249,9 @@ diff -Nru a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c down(&core_lists); - for (i = 0; i < I2C_DRIVER_MAX; i++) -- if (driver = drivers[i]) +- if (driver == drivers[i]) - break; -- if (I2C_DRIVER_MAX = i) { +- if (I2C_DRIVER_MAX == i) { - printk(KERN_WARNING " i2c-core.o: unregister_driver: " - "[%s] not found\n", - driver->name); @@ -273,7 +273,7 @@ diff -Nru a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c */ - for (k=0;k<I2C_ADAP_MAX;k++) { - struct i2c_adapter *adap = adapters[k]; -- if (adap = NULL) /* skip empty entries. */ +- if (adap == NULL) /* skip empty entries. */ - continue; + list_for_each(item1,&adapters) { + adap = list_entry(item1, struct i2c_adapter, list); @@ -297,7 +297,7 @@ diff -Nru a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c - for (j=0;j<I2C_CLIENT_MAX;j++) { - struct i2c_client *client = adap->clients[j]; - if (client != NULL && -- client->driver = driver) { +- client->driver == driver) { - DEB2(printk(KERN_DEBUG "i2c-core.o: " - "detaching client %s:\n", - client->dev.name)); @@ -355,10 +355,10 @@ diff -Nru a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c + struct i2c_client *client; - for (i = 0; i < I2C_CLIENT_MAX ; i++) -- if (adapter->clients[i] && (adapter->clients[i]->addr = addr)) +- if (adapter->clients[i] && (adapter->clients[i]->addr == addr)) + list_for_each(item,&adapter->clients) { + client = list_entry(item, struct i2c_client, list); -+ if (client->addr = addr) ++ if (client->addr == addr) return -EBUSY; - + } @@ -427,7 +427,7 @@ diff -Nru a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c - down(&adapter->list); - for (i = 0; i < I2C_CLIENT_MAX; i++) { -- if (client = adapter->clients[i]) { +- if (client == adapter->clients[i]) { - adapter->clients[i] = NULL; - goto out_unlock; - } @@ -490,7 +490,7 @@ diff -Nru a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c { - int i; - for (i = 0; i < I2C_ADAP_MAX; i++) -- if (adap = adapters[i]) +- if (adap == adapters[i]) - return i; - return -1; + return adap->nr; @@ -504,7 +504,7 @@ diff -Nru a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c + down(&core_lists); + list_for_each(item,&adapters) { + adapter = list_entry(item, struct i2c_adapter, list); -+ if (id = adapter->nr && ++ if (id == adapter->nr && + try_module_get(adapter->owner)) { + up(&core_lists); + return adapter; @@ -579,7 +579,7 @@ diff -Nru a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c - if ((minor >= I2CDEV_ADAPS_MAX) || !(i2cdev_adaps[minor])) + adap = i2c_get_adapter(minor); -+ if (NULL = adap) ++ if (NULL == adap) return -ENODEV; client = kmalloc(sizeof(*client), GFP_KERNEL); @@ -676,20 +676,20 @@ diff -Nru a/drivers/media/video/dpc7146.c b/drivers/media/video/dpc7146.c + struct list_head *item; dpc = (struct dpc*)kmalloc(sizeof(struct dpc), GFP_KERNEL); - if( NULL = dpc ) { + if( NULL == dpc ) { @@ -117,12 +118,10 @@ } /* loop through all i2c-devices on the bus and look who is there */ - for(i = 0; i < I2C_CLIENT_MAX; i++) { -- if( NULL = dpc->i2c_adapter.clients[i] ) { +- if( NULL == dpc->i2c_adapter.clients[i] ) { - continue; - } -- if( I2C_SAA7111A = dpc->i2c_adapter.clients[i]->addr ) +- if( I2C_SAA7111A == dpc->i2c_adapter.clients[i]->addr ) - dpc->saa7111a = dpc->i2c_adapter.clients[i]; + list_for_each(item,&dpc->i2c_adapter.clients) { + client = list_entry(item, struct i2c_client, list); -+ if( I2C_SAA7111A = client->addr ) ++ if( I2C_SAA7111A == client->addr ) + dpc->saa7111a = client; } @@ -712,34 +712,34 @@ diff -Nru a/drivers/media/video/mxb.c b/drivers/media/video/mxb.c /* loop through all i2c-devices on the bus and look who is there */ - for(i = 0; i < I2C_CLIENT_MAX; i++) { -- if( NULL = mxb->i2c_adapter.clients[i] ) { +- if( NULL == mxb->i2c_adapter.clients[i] ) { - continue; - } -- if( I2C_TEA6420_1 = mxb->i2c_adapter.clients[i]->addr ) +- if( I2C_TEA6420_1 == mxb->i2c_adapter.clients[i]->addr ) - mxb->tea6420_1 = mxb->i2c_adapter.clients[i]; -- if( I2C_TEA6420_2 = mxb->i2c_adapter.clients[i]->addr ) +- if( I2C_TEA6420_2 == mxb->i2c_adapter.clients[i]->addr ) - mxb->tea6420_2 = mxb->i2c_adapter.clients[i]; -- if( I2C_TEA6415C_2 = mxb->i2c_adapter.clients[i]->addr ) +- if( I2C_TEA6415C_2 == mxb->i2c_adapter.clients[i]->addr ) - mxb->tea6415c = mxb->i2c_adapter.clients[i]; -- if( I2C_TDA9840 = mxb->i2c_adapter.clients[i]->addr ) +- if( I2C_TDA9840 == mxb->i2c_adapter.clients[i]->addr ) - mxb->tda9840 = mxb->i2c_adapter.clients[i]; -- if( I2C_SAA7111A = mxb->i2c_adapter.clients[i]->addr ) +- if( I2C_SAA7111A == mxb->i2c_adapter.clients[i]->addr ) - mxb->saa7111a = mxb->i2c_adapter.clients[i]; -- if( 0x60 = mxb->i2c_adapter.clients[i]->addr ) +- if( 0x60 == mxb->i2c_adapter.clients[i]->addr ) - mxb->tuner = mxb->i2c_adapter.clients[i]; + list_for_each(item,&mxb->i2c_adapter.clients) { + client = list_entry(item, struct i2c_client, list); -+ if( I2C_TEA6420_1 = client->addr ) ++ if( I2C_TEA6420_1 == client->addr ) + mxb->tea6420_1 = client; -+ if( I2C_TEA6420_2 = client->addr ) ++ if( I2C_TEA6420_2 == client->addr ) + mxb->tea6420_2 = client; -+ if( I2C_TEA6415C_2 = client->addr ) ++ if( I2C_TEA6415C_2 == client->addr ) + mxb->tea6415c = client; -+ if( I2C_TDA9840 = client->addr ) ++ if( I2C_TDA9840 == client->addr ) + mxb->tda9840 = client; -+ if( I2C_SAA7111A = client->addr ) ++ if( I2C_SAA7111A == client->addr ) + mxb->saa7111a = client; -+ if( 0x60 = client->addr ) ++ if( 0x60 == client->addr ) + mxb->tuner = client; } diff --git a/a/content_digest b/N1/content_digest index ed6d631..b2440f7 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020030507003148.GA4622@kroah.com\0" - "From\0greg@kroah.com (Greg KH)\0" + "From\0Greg KH <greg@kroah.com>\0" "Subject\0[PATCH] i2c driver changes for 2.5.69\0" - "Date\0Thu, 19 May 2005 06:23:55 +0000\0" + "Date\0Tue, 6 May 2003 17:33:34 -0700\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "\00:1\0" @@ -61,9 +61,9 @@ " \n" " \tdown(&core_lists);\n" "-\tfor (i = 0; i < I2C_ADAP_MAX; i++)\n" - "-\t\tif (NULL = adapters[i])\n" + "-\t\tif (NULL == adapters[i])\n" "-\t\t\tbreak;\n" - "-\tif (I2C_ADAP_MAX = i) {\n" + "-\tif (I2C_ADAP_MAX == i) {\n" "-\t\tdev_warn(&adap->dev,\n" "-\t\t\t\"register_adapter - enlarge I2C_ADAP_MAX.\\n\");\n" "-\t\tres = -ENOMEM;\n" @@ -84,7 +84,7 @@ " \t * If the parent pointer is not set up,\n" "@@ -99,77 +93,65 @@\n" " \t */\n" - " \tif (adap->dev.parent = NULL)\n" + " \tif (adap->dev.parent == NULL)\n" " \t\tadap->dev.parent = &legacy_bus;\n" "-\tsprintf(adap->dev.bus_id, \"i2c-%d\", i);\n" "+\tsprintf(adap->dev.bus_id, \"i2c-%d\", adap->nr);\n" @@ -124,9 +124,9 @@ " \n" " \tdown(&core_lists);\n" "-\tfor (i = 0; i < I2C_ADAP_MAX; i++)\n" - "-\t\tif (adap = adapters[i])\n" + "-\t\tif (adap == adapters[i])\n" "-\t\t\tbreak;\n" - "-\tif (I2C_ADAP_MAX = i) {\n" + "-\tif (I2C_ADAP_MAX == i) {\n" "-\t\tdev_warn(&adap->dev, \"unregister_adapter adap not found.\\n\");\n" "-\t\tres = -ENODEV;\n" "-\t\tgoto out_unlock;\n" @@ -204,9 +204,9 @@ " \n" " \tdown(&core_lists);\n" "-\tfor (i = 0; i < I2C_DRIVER_MAX; i++)\n" - "-\t\tif (NULL = drivers[i])\n" + "-\t\tif (NULL == drivers[i])\n" "-\t\t\tbreak;\n" - "-\tif (I2C_DRIVER_MAX = i) {\n" + "-\tif (I2C_DRIVER_MAX == i) {\n" "-\t\tprintk(KERN_WARNING \n" "-\t\t \" i2c-core.o: register_driver(%s) \"\n" "-\t\t \"- enlarge I2C_DRIVER_MAX.\\n\",\n" @@ -257,9 +257,9 @@ " \n" " \tdown(&core_lists);\n" "-\tfor (i = 0; i < I2C_DRIVER_MAX; i++)\n" - "-\t\tif (driver = drivers[i])\n" + "-\t\tif (driver == drivers[i])\n" "-\t\t\tbreak;\n" - "-\tif (I2C_DRIVER_MAX = i) {\n" + "-\tif (I2C_DRIVER_MAX == i) {\n" "-\t\tprintk(KERN_WARNING \" i2c-core.o: unregister_driver: \"\n" "-\t\t\t\t \"[%s] not found\\n\",\n" "-\t\t\tdriver->name);\n" @@ -281,7 +281,7 @@ " \t */\n" "-\tfor (k=0;k<I2C_ADAP_MAX;k++) {\n" "-\t\tstruct i2c_adapter *adap = adapters[k];\n" - "-\t\tif (adap = NULL) /* skip empty entries. */\n" + "-\t\tif (adap == NULL) /* skip empty entries. */\n" "-\t\t\tcontinue;\n" "+\tlist_for_each(item1,&adapters) {\n" "+\t\tadap = list_entry(item1, struct i2c_adapter, list);\n" @@ -305,7 +305,7 @@ "-\t\t\tfor (j=0;j<I2C_CLIENT_MAX;j++) { \n" "-\t\t\t\tstruct i2c_client *client = adap->clients[j];\n" "-\t\t\t\tif (client != NULL && \n" - "-\t\t\t\t client->driver = driver) {\n" + "-\t\t\t\t client->driver == driver) {\n" "-\t\t\t\t\tDEB2(printk(KERN_DEBUG \"i2c-core.o: \"\n" "-\t\t\t\t\t\t \"detaching client %s:\\n\",\n" "-\t\t\t\t\t client->dev.name));\n" @@ -363,10 +363,10 @@ "+\tstruct i2c_client *client;\n" " \n" "-\tfor (i = 0; i < I2C_CLIENT_MAX ; i++)\n" - "-\t\tif (adapter->clients[i] && (adapter->clients[i]->addr = addr))\n" + "-\t\tif (adapter->clients[i] && (adapter->clients[i]->addr == addr))\n" "+\tlist_for_each(item,&adapter->clients) {\n" "+\t\tclient = list_entry(item, struct i2c_client, list);\n" - "+\t\tif (client->addr = addr)\n" + "+\t\tif (client->addr == addr)\n" " \t\t\treturn -EBUSY;\n" "-\n" "+\t}\n" @@ -435,7 +435,7 @@ " \n" "-\tdown(&adapter->list);\n" "-\tfor (i = 0; i < I2C_CLIENT_MAX; i++) {\n" - "-\t\tif (client = adapter->clients[i]) {\n" + "-\t\tif (client == adapter->clients[i]) {\n" "-\t\t\tadapter->clients[i] = NULL;\n" "-\t\t\tgoto out_unlock;\n" "-\t\t}\n" @@ -498,7 +498,7 @@ " {\n" "-\tint i;\n" "-\tfor (i = 0; i < I2C_ADAP_MAX; i++)\n" - "-\t\tif (adap = adapters[i])\n" + "-\t\tif (adap == adapters[i])\n" "-\t\t\treturn i;\n" "-\treturn -1;\n" "+\treturn adap->nr;\n" @@ -512,7 +512,7 @@ "+\tdown(&core_lists);\n" "+\tlist_for_each(item,&adapters) {\n" "+\t\tadapter = list_entry(item, struct i2c_adapter, list);\n" - "+\t\tif (id = adapter->nr &&\n" + "+\t\tif (id == adapter->nr &&\n" "+\t\t try_module_get(adapter->owner)) {\n" "+\t\t\tup(&core_lists);\n" "+\t\t\treturn adapter;\n" @@ -587,7 +587,7 @@ " \n" "-\tif ((minor >= I2CDEV_ADAPS_MAX) || !(i2cdev_adaps[minor]))\n" "+\tadap = i2c_get_adapter(minor);\n" - "+\tif (NULL = adap)\n" + "+\tif (NULL == adap)\n" " \t\treturn -ENODEV;\n" " \n" " \tclient = kmalloc(sizeof(*client), GFP_KERNEL);\n" @@ -684,20 +684,20 @@ "+\tstruct list_head *item;\n" " \n" " \tdpc = (struct dpc*)kmalloc(sizeof(struct dpc), GFP_KERNEL);\n" - " \tif( NULL = dpc ) {\n" + " \tif( NULL == dpc ) {\n" "@@ -117,12 +118,10 @@\n" " \t}\n" " \n" " \t/* loop through all i2c-devices on the bus and look who is there */\n" "-\tfor(i = 0; i < I2C_CLIENT_MAX; i++) {\n" - "-\t\tif( NULL = dpc->i2c_adapter.clients[i] ) {\n" + "-\t\tif( NULL == dpc->i2c_adapter.clients[i] ) {\n" "-\t\t\tcontinue;\n" "-\t\t}\n" - "-\t\tif( I2C_SAA7111A = dpc->i2c_adapter.clients[i]->addr ) \n" + "-\t\tif( I2C_SAA7111A == dpc->i2c_adapter.clients[i]->addr ) \n" "-\t\t\tdpc->saa7111a = dpc->i2c_adapter.clients[i];\n" "+\tlist_for_each(item,&dpc->i2c_adapter.clients) {\n" "+\t\tclient = list_entry(item, struct i2c_client, list);\n" - "+\t\tif( I2C_SAA7111A = client->addr ) \n" + "+\t\tif( I2C_SAA7111A == client->addr ) \n" "+\t\t\tdpc->saa7111a = client;\n" " \t}\n" " \n" @@ -720,34 +720,34 @@ " \n" " \t/* loop through all i2c-devices on the bus and look who is there */\n" "-\tfor(i = 0; i < I2C_CLIENT_MAX; i++) {\n" - "-\t\tif( NULL = mxb->i2c_adapter.clients[i] ) {\n" + "-\t\tif( NULL == mxb->i2c_adapter.clients[i] ) {\n" "-\t\t\tcontinue;\n" "-\t\t}\n" - "-\t\tif( I2C_TEA6420_1 = mxb->i2c_adapter.clients[i]->addr )\n" + "-\t\tif( I2C_TEA6420_1 == mxb->i2c_adapter.clients[i]->addr )\n" "-\t\t\tmxb->tea6420_1 = mxb->i2c_adapter.clients[i];\n" - "-\t\tif( I2C_TEA6420_2 = mxb->i2c_adapter.clients[i]->addr ) \n" + "-\t\tif( I2C_TEA6420_2 == mxb->i2c_adapter.clients[i]->addr ) \n" "-\t\t\tmxb->tea6420_2 = mxb->i2c_adapter.clients[i];\n" - "-\t\tif( I2C_TEA6415C_2 = mxb->i2c_adapter.clients[i]->addr ) \n" + "-\t\tif( I2C_TEA6415C_2 == mxb->i2c_adapter.clients[i]->addr ) \n" "-\t\t\tmxb->tea6415c = mxb->i2c_adapter.clients[i];\n" - "-\t\tif( I2C_TDA9840 = mxb->i2c_adapter.clients[i]->addr ) \n" + "-\t\tif( I2C_TDA9840 == mxb->i2c_adapter.clients[i]->addr ) \n" "-\t\t\tmxb->tda9840 = mxb->i2c_adapter.clients[i];\n" - "-\t\tif( I2C_SAA7111A = mxb->i2c_adapter.clients[i]->addr ) \n" + "-\t\tif( I2C_SAA7111A == mxb->i2c_adapter.clients[i]->addr ) \n" "-\t\t\tmxb->saa7111a = mxb->i2c_adapter.clients[i];\n" - "-\t\tif( 0x60 = mxb->i2c_adapter.clients[i]->addr ) \n" + "-\t\tif( 0x60 == mxb->i2c_adapter.clients[i]->addr ) \n" "-\t\t\tmxb->tuner = mxb->i2c_adapter.clients[i];\n" "+\tlist_for_each(item,&mxb->i2c_adapter.clients) {\n" "+\t\tclient = list_entry(item, struct i2c_client, list);\n" - "+\t\tif( I2C_TEA6420_1 = client->addr )\n" + "+\t\tif( I2C_TEA6420_1 == client->addr )\n" "+\t\t\tmxb->tea6420_1 = client;\n" - "+\t\tif( I2C_TEA6420_2 = client->addr ) \n" + "+\t\tif( I2C_TEA6420_2 == client->addr ) \n" "+\t\t\tmxb->tea6420_2 = client;\n" - "+\t\tif( I2C_TEA6415C_2 = client->addr ) \n" + "+\t\tif( I2C_TEA6415C_2 == client->addr ) \n" "+\t\t\tmxb->tea6415c = client;\n" - "+\t\tif( I2C_TDA9840 = client->addr ) \n" + "+\t\tif( I2C_TDA9840 == client->addr ) \n" "+\t\t\tmxb->tda9840 = client;\n" - "+\t\tif( I2C_SAA7111A = client->addr ) \n" + "+\t\tif( I2C_SAA7111A == client->addr ) \n" "+\t\t\tmxb->saa7111a = client;\n" - "+\t\tif( 0x60 = client->addr ) \n" + "+\t\tif( 0x60 == client->addr ) \n" "+\t\t\tmxb->tuner = client;\n" " \t}\n" " \n" @@ -887,4 +887,4 @@ " \n" /* Return the functionality mask */ -8b92efbe6eeee9517e4eadf435fd35c160e20c8cda4551864771cc6f6f7db386 +ee70cc100a84c186c0d04c806b31840a5c084a14fd671dff7cd2660b45b6d1d4
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.