diff for duplicates of <10512287463196@kroah.com> diff --git a/a/1.txt b/N1/1.txt index b263056..a4bc5f9 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -136,7 +136,7 @@ diff -Nru a/drivers/i2c/busses/i2c-viapro.c b/drivers/i2c/busses/i2c-viapro.c - if ((pci_read_config_word(VT596_dev, id->driver_data, &vt596_smba)) - || !(vt596_smba & 0x1)) { - /* try 2nd address and config reg. for 596 */ -- if((id->device = PCI_DEVICE_ID_VIA_82C596_3) && +- if((id->device == PCI_DEVICE_ID_VIA_82C596_3) && - (!pci_read_config_word(VT596_dev, SMBBA2, &vt596_smba)) && - (vt596_smba & 0x1)) { - smb_cf_hstcfg = 0x84; @@ -148,7 +148,7 @@ diff -Nru a/drivers/i2c/busses/i2c-viapro.c b/drivers/i2c/busses/i2c-viapro.c - } - } - vt596_smba &= 0xfff0; -- if(vt596_smba = 0) { +- if(vt596_smba == 0) { - dev_err(&VT596_dev->dev, "SMBus base address " - "uninitialized - upgrade BIOS or use " - "force_addr=0xaddr\n"); @@ -171,7 +171,7 @@ diff -Nru a/drivers/i2c/busses/i2c-viapro.c b/drivers/i2c/busses/i2c-viapro.c - pci_write_config_byte(VT596_dev, SMBHSTCFG, temp | 0x01); - dev_warn(&VT596_dev->dev, "WARNING: SMBus interface set to new " - "address 0x%04x!\n", vt596_smba); -- } else if ((temp & 1) = 0) { +- } else if ((temp & 1) == 0) { - if (force) { - /* NOTE: This assumes I/O space and other allocations - * WERE done by the Bios! Don't complain if your @@ -190,9 +190,9 @@ diff -Nru a/drivers/i2c/busses/i2c-viapro.c b/drivers/i2c/busses/i2c-viapro.c - } - } - -- if ((temp & 0x0E) = 8) +- if ((temp & 0x0E) == 8) - dev_dbg(&VT596_dev->dev, "using Interrupt 9 for SMBus.\n"); -- else if ((temp & 0x0E) = 0) +- else if ((temp & 0x0E) == 0) - dev_dbg(&VT596_dev->dev, "using Interrupt SMI# for SMBus.\n"); - else - dev_dbg(&VT596_dev->dev, "Illegal Interrupt configuration " @@ -243,7 +243,7 @@ diff -Nru a/drivers/i2c/busses/i2c-viapro.c b/drivers/i2c/busses/i2c-viapro.c case I2C_SMBUS_QUICK: outb_p(((addr & 0x7f) << 1) | (read_write & 0x01), @@ -363,7 +254,6 @@ - if ((read_write = I2C_SMBUS_WRITE) || (size = VT596_QUICK)) + if ((read_write == I2C_SMBUS_WRITE) || (size == VT596_QUICK)) return 0; - @@ -295,7 +295,7 @@ diff -Nru a/drivers/i2c/busses/i2c-viapro.c b/drivers/i2c/busses/i2c-viapro.c + if ((pci_read_config_word(pdev, id->driver_data, &vt596_smba)) || + !(vt596_smba & 0x1)) { + /* try 2nd address and config reg. for 596 */ -+ if (id->device = PCI_DEVICE_ID_VIA_82C596_3 && ++ if (id->device == PCI_DEVICE_ID_VIA_82C596_3 && + !pci_read_config_word(pdev, SMBBA2, &vt596_smba) && + (vt596_smba & 0x1)) { + smb_cf_hstcfg = 0x84; @@ -308,7 +308,7 @@ diff -Nru a/drivers/i2c/busses/i2c-viapro.c b/drivers/i2c/busses/i2c-viapro.c + } + vt596_smba &= 0xfff0; -+ if (vt596_smba = 0) { ++ if (vt596_smba == 0) { + dev_err(&pdev->dev, "SMBus base address " + "uninitialized - upgrade BIOS or use " + "force_addr=0xaddr\n"); @@ -331,7 +331,7 @@ diff -Nru a/drivers/i2c/busses/i2c-viapro.c b/drivers/i2c/busses/i2c-viapro.c + pci_write_config_byte(pdev, SMBHSTCFG, temp | 0x01); + dev_warn(&pdev->dev, "WARNING: SMBus interface set to new " + "address 0x%04x!\n", vt596_smba); -+ } else if ((temp & 1) = 0) { ++ } else if ((temp & 1) == 0) { + if (force) { + /* NOTE: This assumes I/O space and other allocations + * WERE done by the Bios! Don't complain if your @@ -349,9 +349,9 @@ diff -Nru a/drivers/i2c/busses/i2c-viapro.c b/drivers/i2c/busses/i2c-viapro.c + } + } + -+ if ((temp & 0x0E) = 8) ++ if ((temp & 0x0E) == 8) + dev_dbg(&pdev->dev, "using Interrupt 9 for SMBus.\n"); -+ else if ((temp & 0x0E) = 0) ++ else if ((temp & 0x0E) == 0) + dev_dbg(&pdev->dev, "using Interrupt SMI# for SMBus.\n"); + else + dev_dbg(&pdev->dev, "Illegal Interrupt configuration " diff --git a/a/content_digest b/N1/content_digest index 0e0fae7..c98b987 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,7 @@ "ref\010512287463226@kroah.com\0" - "ref\010512287461373@kroah.com\0" - "From\0greg@kroah.com (Greg KH)\0" - "Subject\0[PATCH] i2c driver changes for 2.5.68\0" - "Date\0Thu, 19 May 2005 06:23:54 +0000\0" + "From\0Greg KH <greg@kroah.com>\0" + "Subject\0Re: [PATCH] i2c driver changes for 2.5.68\0" + "Date\0Thu, 24 Apr 2003 16:59:06 -0700\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "\00:1\0" @@ -145,7 +144,7 @@ "-\t\tif ((pci_read_config_word(VT596_dev, id->driver_data, &vt596_smba))\n" "-\t\t || !(vt596_smba & 0x1)) {\n" "-\t\t\t/* try 2nd address and config reg. for 596 */\n" - "-\t\t\tif((id->device = PCI_DEVICE_ID_VIA_82C596_3) &&\n" + "-\t\t\tif((id->device == PCI_DEVICE_ID_VIA_82C596_3) &&\n" "-\t\t\t (!pci_read_config_word(VT596_dev, SMBBA2, &vt596_smba)) &&\n" "-\t\t\t (vt596_smba & 0x1)) {\n" "-\t\t\t\tsmb_cf_hstcfg = 0x84;\n" @@ -157,7 +156,7 @@ "-\t\t\t}\n" "-\t\t}\n" "-\t\tvt596_smba &= 0xfff0;\n" - "-\t\tif(vt596_smba = 0) {\n" + "-\t\tif(vt596_smba == 0) {\n" "-\t\t\tdev_err(&VT596_dev->dev, \"SMBus base address \"\n" "-\t\t\t\t\"uninitialized - upgrade BIOS or use \"\n" "-\t\t\t\t\"force_addr=0xaddr\\n\");\n" @@ -180,7 +179,7 @@ "-\t\tpci_write_config_byte(VT596_dev, SMBHSTCFG, temp | 0x01);\n" "-\t\tdev_warn(&VT596_dev->dev, \"WARNING: SMBus interface set to new \"\n" "-\t\t \"address 0x%04x!\\n\", vt596_smba);\n" - "-\t} else if ((temp & 1) = 0) {\n" + "-\t} else if ((temp & 1) == 0) {\n" "-\t\tif (force) {\n" "-\t\t\t/* NOTE: This assumes I/O space and other allocations \n" "-\t\t\t * WERE done by the Bios! Don't complain if your \n" @@ -199,9 +198,9 @@ "-\t\t}\n" "-\t}\n" "-\n" - "-\tif ((temp & 0x0E) = 8)\n" + "-\tif ((temp & 0x0E) == 8)\n" "-\t\tdev_dbg(&VT596_dev->dev, \"using Interrupt 9 for SMBus.\\n\");\n" - "-\telse if ((temp & 0x0E) = 0)\n" + "-\telse if ((temp & 0x0E) == 0)\n" "-\t\tdev_dbg(&VT596_dev->dev, \"using Interrupt SMI# for SMBus.\\n\");\n" "-\telse\n" "-\t\tdev_dbg(&VT596_dev->dev, \"Illegal Interrupt configuration \"\n" @@ -252,7 +251,7 @@ " \tcase I2C_SMBUS_QUICK:\n" " \t\toutb_p(((addr & 0x7f) << 1) | (read_write & 0x01),\n" "@@ -363,7 +254,6 @@\n" - " \tif ((read_write = I2C_SMBUS_WRITE) || (size = VT596_QUICK))\n" + " \tif ((read_write == I2C_SMBUS_WRITE) || (size == VT596_QUICK))\n" " \t\treturn 0;\n" " \n" "-\n" @@ -304,7 +303,7 @@ "+\tif ((pci_read_config_word(pdev, id->driver_data, &vt596_smba)) ||\n" "+\t !(vt596_smba & 0x1)) {\n" "+\t\t/* try 2nd address and config reg. for 596 */\n" - "+\t\tif (id->device = PCI_DEVICE_ID_VIA_82C596_3 &&\n" + "+\t\tif (id->device == PCI_DEVICE_ID_VIA_82C596_3 &&\n" "+\t\t !pci_read_config_word(pdev, SMBBA2, &vt596_smba) &&\n" "+\t\t (vt596_smba & 0x1)) {\n" "+\t\t\tsmb_cf_hstcfg = 0x84;\n" @@ -317,7 +316,7 @@ "+\t}\n" " \n" "+\tvt596_smba &= 0xfff0;\n" - "+\tif (vt596_smba = 0) {\n" + "+\tif (vt596_smba == 0) {\n" "+\t\tdev_err(&pdev->dev, \"SMBus base address \"\n" "+\t\t\t\"uninitialized - upgrade BIOS or use \"\n" "+\t\t\t\"force_addr=0xaddr\\n\");\n" @@ -340,7 +339,7 @@ "+\t\tpci_write_config_byte(pdev, SMBHSTCFG, temp | 0x01);\n" "+\t\tdev_warn(&pdev->dev, \"WARNING: SMBus interface set to new \"\n" "+\t\t \"address 0x%04x!\\n\", vt596_smba);\n" - "+\t} else if ((temp & 1) = 0) {\n" + "+\t} else if ((temp & 1) == 0) {\n" "+\t\tif (force) {\n" "+\t\t\t/* NOTE: This assumes I/O space and other allocations \n" "+\t\t\t * WERE done by the Bios! Don't complain if your \n" @@ -358,9 +357,9 @@ "+\t\t}\n" "+\t}\n" "+\n" - "+\tif ((temp & 0x0E) = 8)\n" + "+\tif ((temp & 0x0E) == 8)\n" "+\t\tdev_dbg(&pdev->dev, \"using Interrupt 9 for SMBus.\\n\");\n" - "+\telse if ((temp & 0x0E) = 0)\n" + "+\telse if ((temp & 0x0E) == 0)\n" "+\t\tdev_dbg(&pdev->dev, \"using Interrupt SMI# for SMBus.\\n\");\n" "+\telse\n" "+\t\tdev_dbg(&pdev->dev, \"Illegal Interrupt configuration \"\n" @@ -438,4 +437,4 @@ " \n" module_init(i2c_vt596_init); -84892f0c563c533d95dadbd97e92c035f7dbc05b256ecac2db2e792cda59cb3d +cbe637d7ff7d1c4a52edf57f1448c71d22a18feb40b6cf18a72841ac8f537cf2
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.