diff for duplicates of <4BD20D56.7080402@gmx.de> diff --git a/a/1.txt b/N1/1.txt index 9aead2b..fc8fad2 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -86,7 +86,8 @@ Florian Tobias Schandinat > > static void tmds_register_write(int index, u8 data) > { -> - viaparinfo->shared->i2c_stuff.i2c_port > - viaparinfo->chip_info->tmds_chip_info.i2c_port; +> - viaparinfo->shared->i2c_stuff.i2c_port = +> - viaparinfo->chip_info->tmds_chip_info.i2c_port; > - > - viafb_i2c_writebyte(viaparinfo->chip_info->tmds_chip_info. > - tmds_chip_slave_addr, index, @@ -100,7 +101,8 @@ Florian Tobias Schandinat > { > u8 data; > -> - viaparinfo->shared->i2c_stuff.i2c_port > - viaparinfo->chip_info->tmds_chip_info.i2c_port; +> - viaparinfo->shared->i2c_stuff.i2c_port = +> - viaparinfo->chip_info->tmds_chip_info.i2c_port; > - viafb_i2c_readbyte((u8) viaparinfo->chip_info-> > - tmds_chip_info.tmds_chip_slave_addr, > - (u8) index, &data); @@ -112,7 +114,8 @@ Florian Tobias Schandinat > > static int tmds_register_read_bytes(int index, u8 *buff, int buff_len) > { -> - viaparinfo->shared->i2c_stuff.i2c_port > - viaparinfo->chip_info->tmds_chip_info.i2c_port; +> - viaparinfo->shared->i2c_stuff.i2c_port = +> - viaparinfo->chip_info->tmds_chip_info.i2c_port; > - viafb_i2c_readbytes((u8) viaparinfo->chip_info->tmds_chip_info. > - tmds_chip_slave_addr, (u8) index, buff, buff_len); > + viafb_i2c_readbytes(viaparinfo->chip_info->tmds_chip_info.i2c_port, @@ -155,7 +158,8 @@ Florian Tobias Schandinat > - viaparinfo->shared->i2c_stuff.i2c_port = GPIOPORTINDEX; > - if (viafb_lvds_identify_vt1636()) { > + if (viafb_lvds_identify_vt1636(VIA_I2C_ADAP_26)) { -> viaparinfo->chip_info->lvds_chip_info.i2c_port > - GPIOPORTINDEX; +> viaparinfo->chip_info->lvds_chip_info.i2c_port = +> - GPIOPORTINDEX; > + VIA_I2C_ADAP_2C; > DEBUG_MSG(KERN_INFO > - "Found VIA VT1636 LVDS on port gpio 0x2c \n"); @@ -327,7 +331,8 @@ Florian Tobias Schandinat > + struct pci_dev *pdev) > { > - int ret; -> - struct via_i2c_stuff *i2c_stuff > - &((struct viafb_par *)viapar)->shared->i2c_stuff; +> - struct via_i2c_stuff *i2c_stuff = +> - &((struct viafb_par *)viapar)->shared->i2c_stuff; > - > - strcpy(i2c_stuff->adapter.name, "via_i2c"); > - i2c_stuff->i2c_port = 0x0; @@ -380,7 +385,7 @@ Florian Tobias Schandinat > udelay(20); > > - ret = i2c_bit_add_bus(&i2c_stuff->adapter); -> - if (ret = 0) +> - if (ret == 0) > - DEBUG_MSG("I2C bus %s registered.\n", i2c_stuff->adapter.name); > - else > - DEBUG_MSG("Failed to register I2C bus %s.\n", @@ -406,7 +411,7 @@ Florian Tobias Schandinat > + struct via_i2c_adap_cfg *adap_cfg = &adap_configs[i]; > + struct via_i2c_stuff *i2c_stuff = &viapar->shared->i2c_stuff[i]; > + -> + if (adap_cfg->type = 0) +> + if (adap_cfg->type == 0) > + break; > + > + ret = create_i2c_bus(&i2c_stuff->adapter, @@ -433,7 +438,7 @@ Florian Tobias Schandinat > + struct via_i2c_stuff *i2c_stuff = &par->shared->i2c_stuff[i]; > + /* only remove those entries in the array that we've > + * actually used (and thus initialized algo_data) */ -> + if (i2c_stuff->adapter.algo_data = &i2c_stuff->algo) +> + if (i2c_stuff->adapter.algo_data == &i2c_stuff->algo) > + i2c_del_adapter(&i2c_stuff->adapter); > + } > } @@ -609,7 +614,7 @@ Florian Tobias Schandinat > + (u8) viaparinfo->chip_info->lvds_chip_info.lvds_chip_slave_addr, > + 0x01, &Buffer[1]); > -> if (!((Buffer[0] = 0x06) && (Buffer[1] = 0x11))) +> if (!((Buffer[0] == 0x06) && (Buffer[1] == 0x11))) > return false; > > /* Check Chip ID: */ @@ -625,8 +630,9 @@ Florian Tobias Schandinat > + viafb_i2c_readbyte(i2c_adapter, > + (u8) viaparinfo->chip_info->lvds_chip_info.lvds_chip_slave_addr, > + 0x03, &Buffer[1]); -> if ((Buffer[0] = 0x45) && (Buffer[1] = 0x33)) { -> viaparinfo->chip_info->lvds_chip_info.lvds_chip_name > VT1636_LVDS; +> if ((Buffer[0] == 0x45) && (Buffer[1] == 0x33)) { +> viaparinfo->chip_info->lvds_chip_info.lvds_chip_name = +> VT1636_LVDS; > diff --git a/drivers/video/via/vt1636.h b/drivers/video/via/vt1636.h > index 2a150c5..4c1314e 100644 > --- a/drivers/video/via/vt1636.h diff --git a/a/content_digest b/N1/content_digest index d9d0f10..710350c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\01271614873-5952-1-git-send-email-corbet@lwn.net\0" "ref\01271614873-5952-11-git-send-email-corbet@lwn.net\0" "From\0Florian Tobias Schandinat <FlorianSchandinat@gmx.de>\0" - "Subject\0Re: [PATCH 10/11] viafb: rework the I2C support in the VIA framebuffer\0" - "Date\0Fri, 23 Apr 2010 21:12:54 +0000\0" + "Subject\0Re: [PATCH 10/11] viafb: rework the I2C support in the VIA framebuffer driver\0" + "Date\0Fri, 23 Apr 2010 23:12:54 +0200\0" "To\0Jonathan Corbet <corbet@lwn.net>\0" "Cc\0linux-kernel@vger.kernel.org" Harald Welte <laforge@gnumonks.org> @@ -100,7 +100,8 @@ "> \n" "> static void tmds_register_write(int index, u8 data)\n" "> {\n" - "> -\tviaparinfo->shared->i2c_stuff.i2c_port > -\t\tviaparinfo->chip_info->tmds_chip_info.i2c_port;\n" + "> -\tviaparinfo->shared->i2c_stuff.i2c_port =\n" + "> -\t\tviaparinfo->chip_info->tmds_chip_info.i2c_port;\n" "> -\n" "> -\tviafb_i2c_writebyte(viaparinfo->chip_info->tmds_chip_info.\n" "> -\t\ttmds_chip_slave_addr, index,\n" @@ -114,7 +115,8 @@ "> {\n" "> \tu8 data;\n" "> \n" - "> -\tviaparinfo->shared->i2c_stuff.i2c_port > -\t\tviaparinfo->chip_info->tmds_chip_info.i2c_port;\n" + "> -\tviaparinfo->shared->i2c_stuff.i2c_port =\n" + "> -\t\tviaparinfo->chip_info->tmds_chip_info.i2c_port;\n" "> -\tviafb_i2c_readbyte((u8) viaparinfo->chip_info->\n" "> -\t tmds_chip_info.tmds_chip_slave_addr,\n" "> -\t\t\t(u8) index, &data);\n" @@ -126,7 +128,8 @@ "> \n" "> static int tmds_register_read_bytes(int index, u8 *buff, int buff_len)\n" "> {\n" - "> -\tviaparinfo->shared->i2c_stuff.i2c_port > -\t\tviaparinfo->chip_info->tmds_chip_info.i2c_port;\n" + "> -\tviaparinfo->shared->i2c_stuff.i2c_port =\n" + "> -\t\tviaparinfo->chip_info->tmds_chip_info.i2c_port;\n" "> -\tviafb_i2c_readbytes((u8) viaparinfo->chip_info->tmds_chip_info.\n" "> -\t\t\t tmds_chip_slave_addr, (u8) index, buff, buff_len);\n" "> +\tviafb_i2c_readbytes(viaparinfo->chip_info->tmds_chip_info.i2c_port,\n" @@ -169,7 +172,8 @@ "> -\t\tviaparinfo->shared->i2c_stuff.i2c_port = GPIOPORTINDEX;\n" "> -\t\tif (viafb_lvds_identify_vt1636()) {\n" "> +\t\tif (viafb_lvds_identify_vt1636(VIA_I2C_ADAP_26)) {\n" - "> \t\t\tviaparinfo->chip_info->lvds_chip_info.i2c_port > -\t\t\t\tGPIOPORTINDEX;\n" + "> \t\t\tviaparinfo->chip_info->lvds_chip_info.i2c_port =\n" + "> -\t\t\t\tGPIOPORTINDEX;\n" "> +\t\t\t\tVIA_I2C_ADAP_2C;\n" "> \t\t\tDEBUG_MSG(KERN_INFO\n" "> -\t\t\t\t \"Found VIA VT1636 LVDS on port gpio 0x2c \\n\");\n" @@ -341,7 +345,8 @@ "> +\t\t\t struct pci_dev *pdev)\n" "> {\n" "> -\tint ret;\n" - "> -\tstruct via_i2c_stuff *i2c_stuff > -\t\t&((struct viafb_par *)viapar)->shared->i2c_stuff;\n" + "> -\tstruct via_i2c_stuff *i2c_stuff =\n" + "> -\t\t&((struct viafb_par *)viapar)->shared->i2c_stuff;\n" "> -\n" "> -\tstrcpy(i2c_stuff->adapter.name, \"via_i2c\");\n" "> -\ti2c_stuff->i2c_port = 0x0;\n" @@ -394,7 +399,7 @@ "> \tudelay(20);\n" "> \n" "> -\tret = i2c_bit_add_bus(&i2c_stuff->adapter);\n" - "> -\tif (ret = 0)\n" + "> -\tif (ret == 0)\n" "> -\t\tDEBUG_MSG(\"I2C bus %s registered.\\n\", i2c_stuff->adapter.name);\n" "> -\telse\n" "> -\t\tDEBUG_MSG(\"Failed to register I2C bus %s.\\n\",\n" @@ -420,7 +425,7 @@ "> +\t\tstruct via_i2c_adap_cfg *adap_cfg = &adap_configs[i];\n" "> +\t\tstruct via_i2c_stuff *i2c_stuff = &viapar->shared->i2c_stuff[i];\n" "> +\n" - "> +\t\tif (adap_cfg->type = 0)\n" + "> +\t\tif (adap_cfg->type == 0)\n" "> +\t\t\tbreak;\n" "> +\n" "> +\t\tret = create_i2c_bus(&i2c_stuff->adapter,\n" @@ -447,7 +452,7 @@ "> +\t\tstruct via_i2c_stuff *i2c_stuff = &par->shared->i2c_stuff[i];\n" "> +\t\t/* only remove those entries in the array that we've\n" "> +\t\t * actually used (and thus initialized algo_data) */\n" - "> +\t\tif (i2c_stuff->adapter.algo_data = &i2c_stuff->algo)\n" + "> +\t\tif (i2c_stuff->adapter.algo_data == &i2c_stuff->algo)\n" "> +\t\t\ti2c_del_adapter(&i2c_stuff->adapter);\n" "> +\t}\n" "> }\n" @@ -623,7 +628,7 @@ "> +\t\t\t (u8) viaparinfo->chip_info->lvds_chip_info.lvds_chip_slave_addr,\n" "> +\t\t\t 0x01, &Buffer[1]);\n" "> \n" - "> \tif (!((Buffer[0] = 0x06) && (Buffer[1] = 0x11)))\n" + "> \tif (!((Buffer[0] == 0x06) && (Buffer[1] == 0x11)))\n" "> \t\treturn false;\n" "> \n" "> \t/* Check Chip ID: */\n" @@ -639,8 +644,9 @@ "> +\tviafb_i2c_readbyte(i2c_adapter,\n" "> +\t\t\t (u8) viaparinfo->chip_info->lvds_chip_info.lvds_chip_slave_addr,\n" "> +\t\t\t 0x03, &Buffer[1]);\n" - "> \tif ((Buffer[0] = 0x45) && (Buffer[1] = 0x33)) {\n" - "> \t\tviaparinfo->chip_info->lvds_chip_info.lvds_chip_name > \t\t\tVT1636_LVDS;\n" + "> \tif ((Buffer[0] == 0x45) && (Buffer[1] == 0x33)) {\n" + "> \t\tviaparinfo->chip_info->lvds_chip_info.lvds_chip_name =\n" + "> \t\t\tVT1636_LVDS;\n" "> diff --git a/drivers/video/via/vt1636.h b/drivers/video/via/vt1636.h\n" "> index 2a150c5..4c1314e 100644\n" "> --- a/drivers/video/via/vt1636.h\n" @@ -655,4 +661,4 @@ "> \t*plvds_setting_info, struct lvds_chip_information *plvds_chip_info);\n" > void viafb_enable_lvds_vt1636(struct lvds_setting_information -fdfba91b05c1db31049f773991dc373c800a9e159300502fd17c25629f86b447 +c9a09d83fe4e913c658e490145a70ec49b58b879fc8bcdaf38622b7f24dbecc1
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.