diff for duplicates of <10476033212149@kroah.com> diff --git a/a/1.txt b/N1/1.txt index c4b2c29..630e40e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -199,10 +199,10 @@ diff -Nru a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c +#else +#define IBM_SIGNATURE "IBM" + dmi_scan_mach(); -+ if(dmi_ident[DMI_SYS_VENDOR] = NULL) ++ if(dmi_ident[DMI_SYS_VENDOR] == NULL) + return 0; + if(strncmp(dmi_ident[DMI_SYS_VENDOR], IBM_SIGNATURE, -+ strlen(IBM_SIGNATURE)) = 0) ++ strlen(IBM_SIGNATURE)) == 0) + return 1; + return 0; +#endif @@ -220,7 +220,7 @@ diff -Nru a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c + struct sd *num = supported; + struct pci_dev *PIIX4_dev = NULL; + -+ if (pci_present() = 0) { ++ if (pci_present() == 0) { + error_return = -ENODEV; + goto END; + } @@ -237,7 +237,7 @@ diff -Nru a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c + num++; + } while (num->mfr); + -+ if (PIIX4_dev = NULL) { ++ if (PIIX4_dev == NULL) { + printk + (KERN_ERR "i2c-piix4.o: Error: Can't detect PIIX4 or compatible device!\n"); + error_return = -ENODEV; @@ -263,7 +263,7 @@ diff -Nru a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c + } else { + pci_read_config_word(PIIX4_dev, SMBBA, &piix4_smba); + piix4_smba &= 0xfff0; -+ if(piix4_smba = 0) { ++ if(piix4_smba == 0) { + printk(KERN_ERR "i2c-piix4.o: SMB base address uninitialized - upgrade BIOS or use force_addr=0xaddr\n"); + return -ENODEV; + } @@ -287,7 +287,7 @@ diff -Nru a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c + printk + (KERN_INFO "i2c-piix4.o: WARNING: SMBus interface set to new " + "address %04x!\n", piix4_smba); -+ } else if ((temp & 1) = 0) { ++ } else if ((temp & 1) == 0) { + if (force) { +/* This should never need to be done, but has been noted that + many Dell machines have the SMBus interface on the PIIX4 @@ -312,10 +312,10 @@ diff -Nru a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c + request_region(piix4_smba, 8, "piix4-smbus"); + +#ifdef DEBUG -+ if ((temp & 0x0E) = 8) ++ if ((temp & 0x0E) == 8) + printk + (KERN_DEBUG "i2c-piix4.o: Using Interrupt 9 for SMBus.\n"); -+ else if ((temp & 0x0E) = 0) ++ else if ((temp & 0x0E) == 0) + printk + (KERN_DEBUG "i2c-piix4.o: Using Interrupt SMI# for SMBus.\n"); + else @@ -449,7 +449,7 @@ diff -Nru a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c + case I2C_SMBUS_BYTE: + outb_p(((addr & 0x7f) << 1) | (read_write & 0x01), + SMBHSTADD); -+ if (read_write = I2C_SMBUS_WRITE) ++ if (read_write == I2C_SMBUS_WRITE) + outb_p(command, SMBHSTCMD); + size = PIIX4_BYTE; + break; @@ -457,7 +457,7 @@ diff -Nru a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c + outb_p(((addr & 0x7f) << 1) | (read_write & 0x01), + SMBHSTADD); + outb_p(command, SMBHSTCMD); -+ if (read_write = I2C_SMBUS_WRITE) ++ if (read_write == I2C_SMBUS_WRITE) + outb_p(data->byte, SMBHSTDAT0); + size = PIIX4_BYTE_DATA; + break; @@ -465,7 +465,7 @@ diff -Nru a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c + outb_p(((addr & 0x7f) << 1) | (read_write & 0x01), + SMBHSTADD); + outb_p(command, SMBHSTCMD); -+ if (read_write = I2C_SMBUS_WRITE) { ++ if (read_write == I2C_SMBUS_WRITE) { + outb_p(data->word & 0xff, SMBHSTDAT0); + outb_p((data->word & 0xff00) >> 8, SMBHSTDAT1); + } @@ -475,7 +475,7 @@ diff -Nru a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c + outb_p(((addr & 0x7f) << 1) | (read_write & 0x01), + SMBHSTADD); + outb_p(command, SMBHSTCMD); -+ if (read_write = I2C_SMBUS_WRITE) { ++ if (read_write == I2C_SMBUS_WRITE) { + len = data->block[0]; + if (len < 0) + len = 0; @@ -495,7 +495,7 @@ diff -Nru a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c + if (piix4_transaction()) /* Error in transaction */ + return -1; + -+ if ((read_write = I2C_SMBUS_WRITE) || (size = PIIX4_QUICK)) ++ if ((read_write == I2C_SMBUS_WRITE) || (size == PIIX4_QUICK)) + return 0; + + diff --git a/a/content_digest b/N1/content_digest index e717754..dba855a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\010476033213315@kroah.com\0" - "From\0greg@kroah.com (Greg KH)\0" - "Subject\0[PATCH] i2c driver changes for 2.5.64\0" - "Date\0Thu, 19 May 2005 06:23:49 +0000\0" + "From\0Greg KH <greg@kroah.com>\0" + "Subject\0Re: [PATCH] i2c driver changes for 2.5.64\0" + "Date\0Thu, 13 Mar 2003 16:55 -0800\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "\00:1\0" @@ -207,10 +207,10 @@ "+#else\n" "+#define IBM_SIGNATURE\t\t\"IBM\"\n" "+\tdmi_scan_mach();\n" - "+\tif(dmi_ident[DMI_SYS_VENDOR] = NULL)\n" + "+\tif(dmi_ident[DMI_SYS_VENDOR] == NULL)\n" "+\t\treturn 0;\n" "+\tif(strncmp(dmi_ident[DMI_SYS_VENDOR], IBM_SIGNATURE,\n" - "+\t strlen(IBM_SIGNATURE)) = 0)\n" + "+\t strlen(IBM_SIGNATURE)) == 0)\n" "+\t\treturn 1;\n" "+\treturn 0;\n" "+#endif\n" @@ -228,7 +228,7 @@ "+\tstruct sd *num = supported;\n" "+\tstruct pci_dev *PIIX4_dev = NULL;\n" "+\n" - "+\tif (pci_present() = 0) {\n" + "+\tif (pci_present() == 0) {\n" "+\t\terror_return = -ENODEV;\n" "+\t\tgoto END;\n" "+\t}\n" @@ -245,7 +245,7 @@ "+\t\tnum++;\n" "+\t} while (num->mfr);\n" "+\n" - "+\tif (PIIX4_dev = NULL) {\n" + "+\tif (PIIX4_dev == NULL) {\n" "+\t\tprintk\n" "+\t\t (KERN_ERR \"i2c-piix4.o: Error: Can't detect PIIX4 or compatible device!\\n\");\n" "+\t\t error_return = -ENODEV;\n" @@ -271,7 +271,7 @@ "+\t} else {\n" "+\t\tpci_read_config_word(PIIX4_dev, SMBBA, &piix4_smba);\n" "+\t\tpiix4_smba &= 0xfff0;\n" - "+\t\tif(piix4_smba = 0) {\n" + "+\t\tif(piix4_smba == 0) {\n" "+\t\t\tprintk(KERN_ERR \"i2c-piix4.o: SMB base address uninitialized - upgrade BIOS or use force_addr=0xaddr\\n\");\n" "+\t\t\treturn -ENODEV;\n" "+\t\t}\n" @@ -295,7 +295,7 @@ "+\t\tprintk\n" "+\t\t (KERN_INFO \"i2c-piix4.o: WARNING: SMBus interface set to new \"\n" "+\t\t \"address %04x!\\n\", piix4_smba);\n" - "+\t} else if ((temp & 1) = 0) {\n" + "+\t} else if ((temp & 1) == 0) {\n" "+\t\tif (force) {\n" "+/* This should never need to be done, but has been noted that\n" "+ many Dell machines have the SMBus interface on the PIIX4\n" @@ -320,10 +320,10 @@ "+\trequest_region(piix4_smba, 8, \"piix4-smbus\");\n" "+\n" "+#ifdef DEBUG\n" - "+\tif ((temp & 0x0E) = 8)\n" + "+\tif ((temp & 0x0E) == 8)\n" "+\t\tprintk\n" "+\t\t (KERN_DEBUG \"i2c-piix4.o: Using Interrupt 9 for SMBus.\\n\");\n" - "+\telse if ((temp & 0x0E) = 0)\n" + "+\telse if ((temp & 0x0E) == 0)\n" "+\t\tprintk\n" "+\t\t (KERN_DEBUG \"i2c-piix4.o: Using Interrupt SMI# for SMBus.\\n\");\n" "+\telse\n" @@ -457,7 +457,7 @@ "+\tcase I2C_SMBUS_BYTE:\n" "+\t\toutb_p(((addr & 0x7f) << 1) | (read_write & 0x01),\n" "+\t\t SMBHSTADD);\n" - "+\t\tif (read_write = I2C_SMBUS_WRITE)\n" + "+\t\tif (read_write == I2C_SMBUS_WRITE)\n" "+\t\t\toutb_p(command, SMBHSTCMD);\n" "+\t\tsize = PIIX4_BYTE;\n" "+\t\tbreak;\n" @@ -465,7 +465,7 @@ "+\t\toutb_p(((addr & 0x7f) << 1) | (read_write & 0x01),\n" "+\t\t SMBHSTADD);\n" "+\t\toutb_p(command, SMBHSTCMD);\n" - "+\t\tif (read_write = I2C_SMBUS_WRITE)\n" + "+\t\tif (read_write == I2C_SMBUS_WRITE)\n" "+\t\t\toutb_p(data->byte, SMBHSTDAT0);\n" "+\t\tsize = PIIX4_BYTE_DATA;\n" "+\t\tbreak;\n" @@ -473,7 +473,7 @@ "+\t\toutb_p(((addr & 0x7f) << 1) | (read_write & 0x01),\n" "+\t\t SMBHSTADD);\n" "+\t\toutb_p(command, SMBHSTCMD);\n" - "+\t\tif (read_write = I2C_SMBUS_WRITE) {\n" + "+\t\tif (read_write == I2C_SMBUS_WRITE) {\n" "+\t\t\toutb_p(data->word & 0xff, SMBHSTDAT0);\n" "+\t\t\toutb_p((data->word & 0xff00) >> 8, SMBHSTDAT1);\n" "+\t\t}\n" @@ -483,7 +483,7 @@ "+\t\toutb_p(((addr & 0x7f) << 1) | (read_write & 0x01),\n" "+\t\t SMBHSTADD);\n" "+\t\toutb_p(command, SMBHSTCMD);\n" - "+\t\tif (read_write = I2C_SMBUS_WRITE) {\n" + "+\t\tif (read_write == I2C_SMBUS_WRITE) {\n" "+\t\t\tlen = data->block[0];\n" "+\t\t\tif (len < 0)\n" "+\t\t\t\tlen = 0;\n" @@ -503,7 +503,7 @@ "+\tif (piix4_transaction())\t/* Error in transaction */\n" "+\t\treturn -1;\n" "+\n" - "+\tif ((read_write = I2C_SMBUS_WRITE) || (size = PIIX4_QUICK))\n" + "+\tif ((read_write == I2C_SMBUS_WRITE) || (size == PIIX4_QUICK))\n" "+\t\treturn 0;\n" "+\n" "+\n" @@ -603,4 +603,4 @@ "+module_init(i2c_piix4_init);\n" +module_exit(i2c_piix4_exit); -32bd8a67dad535e736a9dbdc7625ed34da6990bf321b45286ce4747ff946a150 +99721c73f0eeae0ff5f7c343126d2f145ff508e9ad8d8a0b608dc5309fdd06a7
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.