viafb: improve viafb_par

This patch introduces viafb_shared and is the beginning of a smooth
transition to use it.

viafb_shared should contain all general, non-surface specific data that
should be shared along all viafb framebuffers while viafb_par should only
contain things that are specific to each surface or in other words extend
fb_info.  This change is intended to clean the dual/multi framebuffer
handling up.

This removes the annoyance that viafbinfo1->par points to a different
structure than viaparinfo1.

As the last change is fundamental it is difficult to ensure that all parts
of the driver do not depend on the previous brokenness but the chance of
regressions is very low.

Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: Scott Fang <ScottFang@viatech.com.cn>
Cc: Joseph Chan <JosephChan@via.com.tw>
Cc: Harald Welte <laforge@gnumonks.org>
Cc: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/video/via/lcd.c b/drivers/video/via/lcd.c
index 78c6b3387947..144d34bdf0ac 100644
--- a/drivers/video/via/lcd.c
+++ b/drivers/video/via/lcd.c
@@ -207,13 +207,13 @@ static bool lvds_identify_integratedlvds(void)
 
 int viafb_lvds_trasmitter_identify(void)
 {
-        viaparinfo->i2c_stuff.i2c_port = I2CPORTINDEX;
+        viaparinfo->shared->i2c_stuff.i2c_port = I2CPORTINDEX;
         if (viafb_lvds_identify_vt1636()) {
                 viaparinfo->chip_info->lvds_chip_info.i2c_port = I2CPORTINDEX;
                 DEBUG_MSG(KERN_INFO
                           "Found VIA VT1636 LVDS on port i2c 0x31 \n");
         } else {
-                viaparinfo->i2c_stuff.i2c_port = GPIOPORTINDEX;
+                viaparinfo->shared->i2c_stuff.i2c_port = GPIOPORTINDEX;
                 if (viafb_lvds_identify_vt1636()) {
                         viaparinfo->chip_info->lvds_chip_info.i2c_port =
                                 GPIOPORTINDEX;
@@ -470,7 +470,7 @@ static int lvds_register_read(int index)
 {
         u8 data;
 
-        viaparinfo->i2c_stuff.i2c_port = GPIOPORTINDEX;
+        viaparinfo->shared->i2c_stuff.i2c_port = GPIOPORTINDEX;
         viafb_i2c_readbyte((u8) viaparinfo->chip_info->
             lvds_chip_info.lvds_chip_slave_addr,
                         (u8) index, &data);