diff for duplicates of <10603869373490@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 479e03c..454309e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -325,23 +325,23 @@ diff -Nru a/drivers/i2c/chips/lm85.c b/drivers/i2c/chips/lm85.c +++ b/drivers/i2c/chips/lm85.c Fri Aug 8 16:47:40 2003 @@ -853,19 +853,19 @@ /* Fill in the chip specific driver values */ - if ( kind = any_chip ) { + if ( kind == any_chip ) { type_name = "lm85"; - strlcpy(new_client->dev.name, "Generic LM85", DEVICE_NAME_SIZE); + strlcpy(new_client->name, "Generic LM85", DEVICE_NAME_SIZE); - } else if ( kind = lm85b ) { + } else if ( kind == lm85b ) { type_name = "lm85b"; - strlcpy(new_client->dev.name, "National LM85-B", DEVICE_NAME_SIZE); + strlcpy(new_client->name, "National LM85-B", DEVICE_NAME_SIZE); - } else if ( kind = lm85c ) { + } else if ( kind == lm85c ) { type_name = "lm85c"; - strlcpy(new_client->dev.name, "National LM85-C", DEVICE_NAME_SIZE); + strlcpy(new_client->name, "National LM85-C", DEVICE_NAME_SIZE); - } else if ( kind = adm1027 ) { + } else if ( kind == adm1027 ) { type_name = "adm1027"; - strlcpy(new_client->dev.name, "Analog Devices ADM1027", DEVICE_NAME_SIZE); + strlcpy(new_client->name, "Analog Devices ADM1027", DEVICE_NAME_SIZE); - } else if ( kind = adt7463 ) { + } else if ( kind == adt7463 ) { type_name = "adt7463"; - strlcpy(new_client->dev.name, "Analog Devices ADT7463", DEVICE_NAME_SIZE); + strlcpy(new_client->name, "Analog Devices ADT7463", DEVICE_NAME_SIZE); @@ -526,7 +526,7 @@ diff -Nru a/drivers/i2c/scx200_acb.c b/drivers/i2c/scx200_acb.c - snprintf(description, sizeof(description), "NatSemi SCx200 ACCESS.bus [%s]", adapter->dev.name); + snprintf(description, sizeof(description), "NatSemi SCx200 ACCESS.bus [%s]", adapter->name); - if (request_region(base, 8, description) = 0) { + if (request_region(base, 8, description) == 0) { dev_err(&adapter->dev, "can't allocate io 0x%x-0x%x\n", base, base + 8-1); diff -Nru a/drivers/media/common/saa7146_i2c.c b/drivers/media/common/saa7146_i2c.c @@ -669,7 +669,7 @@ diff -Nru a/drivers/media/video/bt819.c b/drivers/media/video/bt819.c - decoder->client->dev.name, *iarg)); + decoder->client->name, *iarg)); - if (*iarg = VIDEO_MODE_NTSC) { + if (*iarg == VIDEO_MODE_NTSC) { bt819_setbit(decoder, 0x01, 0, 1); @@ -321,7 +321,7 @@ int *iarg = arg; @@ -1133,14 +1133,14 @@ diff -Nru a/drivers/media/video/tuner.c b/drivers/media/video/tuner.c + strlcpy(client->name, tuners[t->type].name, DEVICE_NAME_SIZE); } i2c_attach_client(client); - if (t->type = TUNER_MT2032) + if (t->type == TUNER_MT2032) @@ -875,7 +875,7 @@ t->type = *iarg; printk("tuner: type set to %d (%s)\n", t->type,tuners[t->type].name); - strlcpy(client->dev.name, tuners[t->type].name, DEVICE_NAME_SIZE); + strlcpy(client->name, tuners[t->type].name, DEVICE_NAME_SIZE); - if (t->type = TUNER_MT2032) + if (t->type == TUNER_MT2032) mt2032_init(client); break; @@ -962,9 +962,7 @@ diff --git a/a/content_digest b/N1/content_digest index eb0d595..3cec669 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020030808235501.GA2795@kroah.com\0" - "From\0greg@kroah.com (Greg KH)\0" + "From\0Greg KH <greg@kroah.com>\0" "Subject\0[PATCH] More i2c driver changes 2.6.0-test2\0" - "Date\0Thu, 19 May 2005 06:24:11 +0000\0" + "Date\0Fri, 8 Aug 2003 16:55:37 -0700\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "\00:1\0" @@ -333,23 +333,23 @@ "+++ b/drivers/i2c/chips/lm85.c\tFri Aug 8 16:47:40 2003\n" "@@ -853,19 +853,19 @@\n" " \t/* Fill in the chip specific driver values */\n" - " \tif ( kind = any_chip ) {\n" + " \tif ( kind == any_chip ) {\n" " \t\ttype_name = \"lm85\";\n" "-\t\tstrlcpy(new_client->dev.name, \"Generic LM85\", DEVICE_NAME_SIZE);\n" "+\t\tstrlcpy(new_client->name, \"Generic LM85\", DEVICE_NAME_SIZE);\n" - " \t} else if ( kind = lm85b ) {\n" + " \t} else if ( kind == lm85b ) {\n" " \t\ttype_name = \"lm85b\";\n" "-\t\tstrlcpy(new_client->dev.name, \"National LM85-B\", DEVICE_NAME_SIZE);\n" "+\t\tstrlcpy(new_client->name, \"National LM85-B\", DEVICE_NAME_SIZE);\n" - " \t} else if ( kind = lm85c ) {\n" + " \t} else if ( kind == lm85c ) {\n" " \t\ttype_name = \"lm85c\";\n" "-\t\tstrlcpy(new_client->dev.name, \"National LM85-C\", DEVICE_NAME_SIZE);\n" "+\t\tstrlcpy(new_client->name, \"National LM85-C\", DEVICE_NAME_SIZE);\n" - " \t} else if ( kind = adm1027 ) {\n" + " \t} else if ( kind == adm1027 ) {\n" " \t\ttype_name = \"adm1027\";\n" "-\t\tstrlcpy(new_client->dev.name, \"Analog Devices ADM1027\", DEVICE_NAME_SIZE);\n" "+\t\tstrlcpy(new_client->name, \"Analog Devices ADM1027\", DEVICE_NAME_SIZE);\n" - " \t} else if ( kind = adt7463 ) {\n" + " \t} else if ( kind == adt7463 ) {\n" " \t\ttype_name = \"adt7463\";\n" "-\t\tstrlcpy(new_client->dev.name, \"Analog Devices ADT7463\", DEVICE_NAME_SIZE);\n" "+\t\tstrlcpy(new_client->name, \"Analog Devices ADT7463\", DEVICE_NAME_SIZE);\n" @@ -534,7 +534,7 @@ " \n" "-\tsnprintf(description, sizeof(description), \"NatSemi SCx200 ACCESS.bus [%s]\", adapter->dev.name);\n" "+\tsnprintf(description, sizeof(description), \"NatSemi SCx200 ACCESS.bus [%s]\", adapter->name);\n" - " \tif (request_region(base, 8, description) = 0) {\n" + " \tif (request_region(base, 8, description) == 0) {\n" " \t\tdev_err(&adapter->dev, \"can't allocate io 0x%x-0x%x\\n\",\n" " \t\t\tbase, base + 8-1);\n" "diff -Nru a/drivers/media/common/saa7146_i2c.c b/drivers/media/common/saa7146_i2c.c\n" @@ -677,7 +677,7 @@ "-\t\t\t\t decoder->client->dev.name, *iarg));\n" "+\t\t\t\t decoder->client->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" "@@ -321,7 +321,7 @@\n" " \t\t\tint *iarg = arg;\n" @@ -1141,14 +1141,14 @@ "+\t\tstrlcpy(client->name, tuners[t->type].name, DEVICE_NAME_SIZE);\n" " \t}\n" " i2c_attach_client(client);\n" - " if (t->type = TUNER_MT2032)\n" + " if (t->type == TUNER_MT2032)\n" "@@ -875,7 +875,7 @@\n" " \t\tt->type = *iarg;\n" " \t\tprintk(\"tuner: type set to %d (%s)\\n\",\n" " t->type,tuners[t->type].name);\n" "-\t\tstrlcpy(client->dev.name, tuners[t->type].name, DEVICE_NAME_SIZE);\n" "+\t\tstrlcpy(client->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" "@@ -962,9 +962,7 @@\n" @@ -1195,4 +1195,4 @@ " };\n" #define to_i2c_adapter(d) container_of(d, struct i2c_adapter, dev) -2a5a4d1090c02b931c480b5af2a8cd17cd2092d2f4c7260dfccfdbad1d62fbd7 +a97ea754d2a347dd9047f5b93535989422fbd0b21919321949d8d2551c044ad7
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.