diff for duplicates of <10476033153504@kroah.com> diff --git a/a/1.txt b/N1/1.txt index a6aa557..044da68 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -198,7 +198,7 @@ diff -Nru a/drivers/i2c/busses/i2c-ali15x3.c b/drivers/i2c/busses/i2c-ali15x3.c + struct pci_dev *ALI15X3_dev; + + /* First check whether we can access PCI at all */ -+ if (pci_present() = 0) { ++ if (pci_present() == 0) { + printk("i2c-ali15x3.o: Error: No PCI-bus found!\n"); + return -ENODEV; + } @@ -207,7 +207,7 @@ diff -Nru a/drivers/i2c/busses/i2c-ali15x3.c b/drivers/i2c/busses/i2c-ali15x3.c + ALI15X3_dev = NULL; + ALI15X3_dev = pci_find_device(PCI_VENDOR_ID_AL, + PCI_DEVICE_ID_AL_M7101, ALI15X3_dev); -+ if (ALI15X3_dev = NULL) { ++ if (ALI15X3_dev == NULL) { + printk("i2c-ali15x3.o: Error: Can't detect ali15x3!\n"); + return -ENODEV; + } @@ -232,7 +232,7 @@ diff -Nru a/drivers/i2c/busses/i2c-ali15x3.c b/drivers/i2c/busses/i2c-ali15x3.c +/* Determine the address of the SMBus area */ + pci_read_config_word(ALI15X3_dev, SMBBA, &ali15x3_smba); + ali15x3_smba &= (0xffff & ~(ALI15X3_SMB_IOSIZE - 1)); -+ if (ali15x3_smba = 0 && force_addr = 0) { ++ if (ali15x3_smba == 0 && force_addr == 0) { + printk + ("i2c-ali15x3.o: ALI15X3_smb region uninitialized - upgrade BIOS or use force_addr=0xaddr\n"); + return -ENODEV; @@ -250,9 +250,11 @@ diff -Nru a/drivers/i2c/busses/i2c-ali15x3.c b/drivers/i2c/busses/i2c-ali15x3.c + + if(force_addr) { + printk("i2c-ali15x3.o: forcing ISA address 0x%04X\n", ali15x3_smba); -+ if (PCIBIOS_SUCCESSFUL !+ pci_write_config_word(ALI15X3_dev, SMBBA, ali15x3_smba)) ++ if (PCIBIOS_SUCCESSFUL != ++ pci_write_config_word(ALI15X3_dev, SMBBA, ali15x3_smba)) + return -ENODEV; -+ if (PCIBIOS_SUCCESSFUL !+ pci_read_config_word(ALI15X3_dev, SMBBA, &a)) ++ if (PCIBIOS_SUCCESSFUL != ++ pci_read_config_word(ALI15X3_dev, SMBBA, &a)) + return -ENODEV; + if ((a & ~(ALI15X3_SMB_IOSIZE - 1)) != ali15x3_smba) { + /* make sure it works */ @@ -262,14 +264,14 @@ diff -Nru a/drivers/i2c/busses/i2c-ali15x3.c b/drivers/i2c/busses/i2c-ali15x3.c + } +/* check if whole device is enabled */ + pci_read_config_byte(ALI15X3_dev, SMBCOM, &temp); -+ if ((temp & 1) = 0) { ++ if ((temp & 1) == 0) { + printk("i2c-ali15x3: enabling SMBus device\n"); + pci_write_config_byte(ALI15X3_dev, SMBCOM, temp | 0x01); + } + +/* Is SMB Host controller enabled? */ + pci_read_config_byte(ALI15X3_dev, SMBHSTCFG, &temp); -+ if ((temp & 1) = 0) { ++ if ((temp & 1) == 0) { + printk("i2c-ali15x3: enabling SMBus controller\n"); + pci_write_config_byte(ALI15X3_dev, SMBHSTCFG, temp | 0x01); + } @@ -285,7 +287,7 @@ diff -Nru a/drivers/i2c/busses/i2c-ali15x3.c b/drivers/i2c/busses/i2c-ali15x3.c + The interrupt routing for SMB is set up in register 0x77 in the + 1533 ISA Bridge device, NOT in the 7101 device. + Don't bother with finding the 1533 device and reading the register. -+ if ((....... & 0x0F) = 1) ++ if ((....... & 0x0F) == 1) + printk("i2c-ali15x3.o: ALI15X3 using Interrupt 9 for SMBus.\n"); +*/ + pci_read_config_byte(ALI15X3_dev, SMBREV, &temp); @@ -475,7 +477,7 @@ diff -Nru a/drivers/i2c/busses/i2c-ali15x3.c b/drivers/i2c/busses/i2c-ali15x3.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 = ALI15X3_BYTE; + break; @@ -483,7 +485,7 @@ diff -Nru a/drivers/i2c/busses/i2c-ali15x3.c b/drivers/i2c/busses/i2c-ali15x3.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 = ALI15X3_BYTE_DATA; + break; @@ -491,7 +493,7 @@ diff -Nru a/drivers/i2c/busses/i2c-ali15x3.c b/drivers/i2c/busses/i2c-ali15x3.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); + } @@ -501,7 +503,7 @@ diff -Nru a/drivers/i2c/busses/i2c-ali15x3.c b/drivers/i2c/busses/i2c-ali15x3.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; @@ -525,7 +527,7 @@ diff -Nru a/drivers/i2c/busses/i2c-ali15x3.c b/drivers/i2c/busses/i2c-ali15x3.c + if (ali15x3_transaction()) /* Error in transaction */ + return -1; + -+ if ((read_write = I2C_SMBUS_WRITE) || (size = ALI15X3_QUICK)) ++ if ((read_write == I2C_SMBUS_WRITE) || (size == ALI15X3_QUICK)) + return 0; + + diff --git a/a/content_digest b/N1/content_digest index c816749..c11cc4d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,7 @@ "ref\020030314005027.GA1923@kroah.com\0" - "ref\010476033213315@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.64\0" - "Date\0Thu, 19 May 2005 06:23:50 +0000\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,7 +206,7 @@ "+\tstruct pci_dev *ALI15X3_dev;\n" "+\n" "+\t/* First check whether we can access PCI at all */\n" - "+\tif (pci_present() = 0) {\n" + "+\tif (pci_present() == 0) {\n" "+\t\tprintk(\"i2c-ali15x3.o: Error: No PCI-bus found!\\n\");\n" "+\t\treturn -ENODEV;\n" "+\t}\n" @@ -216,7 +215,7 @@ "+\tALI15X3_dev = NULL;\n" "+\tALI15X3_dev = pci_find_device(PCI_VENDOR_ID_AL,\n" "+\t\t\t\t PCI_DEVICE_ID_AL_M7101, ALI15X3_dev);\n" - "+\tif (ALI15X3_dev = NULL) {\n" + "+\tif (ALI15X3_dev == NULL) {\n" "+\t\tprintk(\"i2c-ali15x3.o: Error: Can't detect ali15x3!\\n\");\n" "+\t\treturn -ENODEV;\n" "+\t}\n" @@ -241,7 +240,7 @@ "+/* Determine the address of the SMBus area */\n" "+\tpci_read_config_word(ALI15X3_dev, SMBBA, &ali15x3_smba);\n" "+\tali15x3_smba &= (0xffff & ~(ALI15X3_SMB_IOSIZE - 1));\n" - "+\tif (ali15x3_smba = 0 && force_addr = 0) {\n" + "+\tif (ali15x3_smba == 0 && force_addr == 0) {\n" "+\t\tprintk\n" "+\t\t (\"i2c-ali15x3.o: ALI15X3_smb region uninitialized - upgrade BIOS or use force_addr=0xaddr\\n\");\n" "+\t\treturn -ENODEV;\n" @@ -259,9 +258,11 @@ "+\n" "+\tif(force_addr) {\n" "+\t\tprintk(\"i2c-ali15x3.o: forcing ISA address 0x%04X\\n\", ali15x3_smba);\n" - "+\t\tif (PCIBIOS_SUCCESSFUL !+\t\t pci_write_config_word(ALI15X3_dev, SMBBA, ali15x3_smba))\n" + "+\t\tif (PCIBIOS_SUCCESSFUL !=\n" + "+\t\t pci_write_config_word(ALI15X3_dev, SMBBA, ali15x3_smba))\n" "+\t\t\treturn -ENODEV;\n" - "+\t\tif (PCIBIOS_SUCCESSFUL !+\t\t pci_read_config_word(ALI15X3_dev, SMBBA, &a))\n" + "+\t\tif (PCIBIOS_SUCCESSFUL !=\n" + "+\t\t pci_read_config_word(ALI15X3_dev, SMBBA, &a))\n" "+\t\t\treturn -ENODEV;\n" "+\t\tif ((a & ~(ALI15X3_SMB_IOSIZE - 1)) != ali15x3_smba) {\n" "+\t\t\t/* make sure it works */\n" @@ -271,14 +272,14 @@ "+\t}\n" "+/* check if whole device is enabled */\n" "+\tpci_read_config_byte(ALI15X3_dev, SMBCOM, &temp);\n" - "+\tif ((temp & 1) = 0) {\n" + "+\tif ((temp & 1) == 0) {\n" "+\t\tprintk(\"i2c-ali15x3: enabling SMBus device\\n\");\n" "+\t\tpci_write_config_byte(ALI15X3_dev, SMBCOM, temp | 0x01);\n" "+\t}\n" "+\n" "+/* Is SMB Host controller enabled? */\n" "+\tpci_read_config_byte(ALI15X3_dev, SMBHSTCFG, &temp);\n" - "+\tif ((temp & 1) = 0) {\n" + "+\tif ((temp & 1) == 0) {\n" "+\t\tprintk(\"i2c-ali15x3: enabling SMBus controller\\n\");\n" "+\t\tpci_write_config_byte(ALI15X3_dev, SMBHSTCFG, temp | 0x01);\n" "+\t}\n" @@ -294,7 +295,7 @@ "+ The interrupt routing for SMB is set up in register 0x77 in the\n" "+ 1533 ISA Bridge device, NOT in the 7101 device.\n" "+ Don't bother with finding the 1533 device and reading the register.\n" - "+ if ((....... & 0x0F) = 1)\n" + "+ if ((....... & 0x0F) == 1)\n" "+ printk(\"i2c-ali15x3.o: ALI15X3 using Interrupt 9 for SMBus.\\n\");\n" "+*/\n" "+\tpci_read_config_byte(ALI15X3_dev, SMBREV, &temp);\n" @@ -484,7 +485,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 = ALI15X3_BYTE;\n" "+\t\tbreak;\n" @@ -492,7 +493,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 = ALI15X3_BYTE_DATA;\n" "+\t\tbreak;\n" @@ -500,7 +501,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" @@ -510,7 +511,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" @@ -534,7 +535,7 @@ "+\tif (ali15x3_transaction())\t/* Error in transaction */\n" "+\t\treturn -1;\n" "+\n" - "+\tif ((read_write = I2C_SMBUS_WRITE) || (size = ALI15X3_QUICK))\n" + "+\tif ((read_write == I2C_SMBUS_WRITE) || (size == ALI15X3_QUICK))\n" "+\t\treturn 0;\n" "+\n" "+\n" @@ -644,4 +645,4 @@ "+module_init(i2c_ali15x3_init);\n" +module_exit(i2c_ali15x3_exit); -b9d67f5b7333e1fe91a92d7dd0e4dd81b2418877a5ade6811b035765eb846a72 +ee83c30170cba566340642ec44afdfbce49801b2ba5ccf12d0b4d2d679ee5989
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.