diff for duplicates of <20030623235111.GC11901@kroah.com> diff --git a/a/1.txt b/N1/1.txt index cf2c62a..a407f73 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -211,7 +211,7 @@ diff -Nru a/drivers/i2c/busses/i2c-ali1535.c b/drivers/i2c/busses/i2c-ali1535.c + /* Determine the address of the SMBus area */ + pci_read_config_word(dev, SMBBA, &ali1535_smba); + ali1535_smba &= (0xffff & ~(ALI1535_SMB_IOSIZE - 1)); -+ if (ali1535_smba = 0) { ++ if (ali1535_smba == 0) { + dev_warn(&dev->dev, + "ALI1535_smb region uninitialized - upgrade BIOS?\n"); + goto exit; @@ -225,14 +225,14 @@ diff -Nru a/drivers/i2c/busses/i2c-ali1535.c b/drivers/i2c/busses/i2c-ali1535.c + + /* check if whole device is enabled */ + pci_read_config_byte(dev, SMBCFG, &temp); -+ if ((temp & ALI1535_SMBIO_EN) = 0) { ++ if ((temp & ALI1535_SMBIO_EN) == 0) { + dev_err(&dev->dev, "SMB device not enabled - upgrade BIOS?\n"); + goto exit_free; + } + + /* Is SMB Host controller enabled? */ + pci_read_config_byte(dev, SMBHSTCFG, &temp); -+ if ((temp & 1) = 0) { ++ if ((temp & 1) == 0) { + dev_err(&dev->dev, "SMBus controller not enabled - upgrade BIOS?\n"); + goto exit_free; + } @@ -244,7 +244,7 @@ diff -Nru a/drivers/i2c/busses/i2c-ali1535.c b/drivers/i2c/busses/i2c-ali1535.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) + dev_dbg(&dev->dev, "ALI1535 using Interrupt 9 for SMBus.\n"); + */ + pci_read_config_byte(dev, SMBREV, &temp); @@ -436,7 +436,7 @@ diff -Nru a/drivers/i2c/busses/i2c-ali1535.c b/drivers/i2c/busses/i2c-ali1535.c + SMBHSTADD); + size = ALI1535_BYTE; + outb_p(size, SMBHSTTYP); /* output command */ -+ if (read_write = I2C_SMBUS_WRITE) ++ if (read_write == I2C_SMBUS_WRITE) + outb_p(command, SMBHSTCMD); + break; + case I2C_SMBUS_BYTE_DATA: @@ -445,7 +445,7 @@ diff -Nru a/drivers/i2c/busses/i2c-ali1535.c b/drivers/i2c/busses/i2c-ali1535.c + size = ALI1535_BYTE_DATA; + outb_p(size, SMBHSTTYP); /* output command */ + outb_p(command, SMBHSTCMD); -+ if (read_write = I2C_SMBUS_WRITE) ++ if (read_write == I2C_SMBUS_WRITE) + outb_p(data->byte, SMBHSTDAT0); + break; + case I2C_SMBUS_WORD_DATA: @@ -454,7 +454,7 @@ diff -Nru a/drivers/i2c/busses/i2c-ali1535.c b/drivers/i2c/busses/i2c-ali1535.c + size = ALI1535_WORD_DATA; + outb_p(size, SMBHSTTYP); /* output command */ + 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); + } @@ -465,7 +465,7 @@ diff -Nru a/drivers/i2c/busses/i2c-ali1535.c b/drivers/i2c/busses/i2c-ali1535.c + size = ALI1535_BLOCK_DATA; + outb_p(size, SMBHSTTYP); /* output command */ + 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; @@ -490,7 +490,7 @@ diff -Nru a/drivers/i2c/busses/i2c-ali1535.c b/drivers/i2c/busses/i2c-ali1535.c + goto EXIT; + } + -+ if ((read_write = I2C_SMBUS_WRITE) || (size = ALI1535_QUICK)) { ++ if ((read_write == I2C_SMBUS_WRITE) || (size == ALI1535_QUICK)) { + result = 0; + goto EXIT; + } diff --git a/a/content_digest b/N1/content_digest index 77c3889..60f26c3 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\020030623234939.GA11901@kroah.com\0" "ref\020030623235104.GB11901@kroah.com\0" - "From\0greg@kroah.com (Greg KH)\0" - "Subject\0[PATCH] i2c driver changes for 2.5.73\0" - "Date\0Thu, 19 May 2005 06:24:01 +0000\0" + "From\0Greg KH <greg@kroah.com>\0" + "Subject\0Re: [PATCH] i2c driver changes for 2.5.73\0" + "Date\0Mon, 23 Jun 2003 16:51:11 -0700\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "\00:1\0" @@ -220,7 +220,7 @@ "+\t/* Determine the address of the SMBus area */\n" "+\tpci_read_config_word(dev, SMBBA, &ali1535_smba);\n" "+\tali1535_smba &= (0xffff & ~(ALI1535_SMB_IOSIZE - 1));\n" - "+\tif (ali1535_smba = 0) {\n" + "+\tif (ali1535_smba == 0) {\n" "+\t\tdev_warn(&dev->dev,\n" "+\t\t\t\"ALI1535_smb region uninitialized - upgrade BIOS?\\n\");\n" "+\t\tgoto exit;\n" @@ -234,14 +234,14 @@ "+\n" "+\t/* check if whole device is enabled */\n" "+\tpci_read_config_byte(dev, SMBCFG, &temp);\n" - "+\tif ((temp & ALI1535_SMBIO_EN) = 0) {\n" + "+\tif ((temp & ALI1535_SMBIO_EN) == 0) {\n" "+\t\tdev_err(&dev->dev, \"SMB device not enabled - upgrade BIOS?\\n\");\n" "+\t\tgoto exit_free;\n" "+\t}\n" "+\n" "+\t/* Is SMB Host controller enabled? */\n" "+\tpci_read_config_byte(dev, SMBHSTCFG, &temp);\n" - "+\tif ((temp & 1) = 0) {\n" + "+\tif ((temp & 1) == 0) {\n" "+\t\tdev_err(&dev->dev, \"SMBus controller not enabled - upgrade BIOS?\\n\");\n" "+\t\tgoto exit_free;\n" "+\t}\n" @@ -253,7 +253,7 @@ "+\t The interrupt routing for SMB is set up in register 0x77 in the\n" "+\t 1533 ISA Bridge device, NOT in the 7101 device.\n" "+\t Don't bother with finding the 1533 device and reading the register.\n" - "+\tif ((....... & 0x0F) = 1)\n" + "+\tif ((....... & 0x0F) == 1)\n" "+\t\tdev_dbg(&dev->dev, \"ALI1535 using Interrupt 9 for SMBus.\\n\");\n" "+\t*/\n" "+\tpci_read_config_byte(dev, SMBREV, &temp);\n" @@ -445,7 +445,7 @@ "+\t\t SMBHSTADD);\n" "+\t\tsize = ALI1535_BYTE;\n" "+\t\toutb_p(size, SMBHSTTYP);\t/* output command */\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\tbreak;\n" "+\tcase I2C_SMBUS_BYTE_DATA:\n" @@ -454,7 +454,7 @@ "+\t\tsize = ALI1535_BYTE_DATA;\n" "+\t\toutb_p(size, SMBHSTTYP);\t/* output command */\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\tbreak;\n" "+\tcase I2C_SMBUS_WORD_DATA:\n" @@ -463,7 +463,7 @@ "+\t\tsize = ALI1535_WORD_DATA;\n" "+\t\toutb_p(size, SMBHSTTYP);\t/* output command */\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" @@ -474,7 +474,7 @@ "+\t\tsize = ALI1535_BLOCK_DATA;\n" "+\t\toutb_p(size, SMBHSTTYP);\t/* output command */\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" @@ -499,7 +499,7 @@ "+\t\tgoto EXIT;\n" "+\t}\n" "+\n" - "+\tif ((read_write = I2C_SMBUS_WRITE) || (size = ALI1535_QUICK)) {\n" + "+\tif ((read_write == I2C_SMBUS_WRITE) || (size == ALI1535_QUICK)) {\n" "+\t\tresult = 0;\n" "+\t\tgoto EXIT;\n" "+\t}\n" @@ -617,4 +617,4 @@ "+module_init(i2c_ali1535_init);\n" +module_exit(i2c_ali1535_exit); -f70c8e7845293d2736127c583b52391cfb6eaf55086e3e88eec17712bb890e1f +40dc424e9aa1843f2b0c030b1dd15e18b470edf56137693b124322d8e9e13e6d
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.