rivafb/nvidiafb: Various cleanups

Various cleanups to rivafb/nvidiafb's I2C code:
* Drop useless par->bus.
* Refactor I2C bus deletion code.
* Drop useless variable initialization.
* Remove unneeded include of <linux/i2c-id.h>.
* Simplify +1/-1.
* Add __devinit tags where possible.

[adaplas]
The varible initialization are not useless. However, rivafb must
check if i2c bus are created properly before reading the EDID
block.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Antonino Daplas <adaplas@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c
index b8d50f178ad5..9e6ee1ffd9f3 100644
--- a/drivers/video/riva/fbdev.c
+++ b/drivers/video/riva/fbdev.c
@@ -1788,10 +1788,10 @@ static int __devinit riva_get_EDID_i2c(struct fb_info *info)
 
         NVTRACE_ENTER();
         riva_create_i2c_busses(par);
-        for (i = 0; i < par->bus; i++) {
+        for (i = 0; i < 3; i++) {
                 if (!par->chan[i].par)
                         continue;
-                riva_probe_i2c_connector(par, i+1, &par->EDID);
+                riva_probe_i2c_connector(par, i, &par->EDID);
                 if (par->EDID && !fb_parse_edid(par->EDID, &var)) {
                         printk(PFX "Found EDID Block from BUS %i\n", i);
                         break;