viafb: rename display_timing to via_display_timing

The struct display_timing is specific to the via subsystem. The naming leads to
collisions with the new struct display_timing, which is supposed to be a shared
struct between different subsystems.
To clean this up, prepend the existing struct with the subsystem it is specific
to.

Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>

diff --git a/drivers/video/via/hw.c b/drivers/video/via/hw.c
index 80233dae358ae1e1784d647e41382f90603bd23c..22450908306c3f77b454a6396d82c6363f60943d 100644 (file)
--- a/drivers/video/via/hw.c
+++ b/drivers/video/via/hw.c
@@ -1467,10 +1467,10 @@ void viafb_set_vclock(u32 clk, int set_iga)
        via_write_misc_reg_mask(0x0C, 0x0C); /* select external clock */
 }
 
-struct display_timing var_to_timing(const struct fb_var_screeninfo *var,
+struct via_display_timing var_to_timing(const struct fb_var_screeninfo *var,
        u16 cxres, u16 cyres)
 {
-       struct display_timing timing;
+       struct via_display_timing timing;
        u16 dx = (var->xres - cxres) / 2, dy = (var->yres - cyres) / 2;
 
        timing.hor_addr = cxres;
@@ -1491,7 +1491,7 @@ struct display_timing var_to_timing(const struct fb_var_screeninfo *var,
 void viafb_fill_crtc_timing(const struct fb_var_screeninfo *var,
        u16 cxres, u16 cyres, int iga)
 {
-       struct display_timing crt_reg = var_to_timing(var,
+       struct via_display_timing crt_reg = var_to_timing(var,
                cxres ? cxres : var->xres, cyres ? cyres : var->yres);
 
        if (iga == IGA1)

diff --git a/drivers/video/via/hw.h b/drivers/video/via/hw.h
index a8205754c7361ff2d68662892cbc581abaad2706..3be073c58b03b6b5e1c1c64d16298fa317053da5 100644 (file)
--- a/drivers/video/via/hw.h
+++ b/drivers/video/via/hw.h
@@ -637,7 +637,7 @@ extern int viafb_LCD_ON;
 extern int viafb_DVI_ON;
 extern int viafb_hotplug;
 
-struct display_timing var_to_timing(const struct fb_var_screeninfo *var,
+struct via_display_timing var_to_timing(const struct fb_var_screeninfo *var,
        u16 cxres, u16 cyres);
 void viafb_fill_crtc_timing(const struct fb_var_screeninfo *var,
        u16 cxres, u16 cyres, int iga);

diff --git a/drivers/video/via/lcd.c b/drivers/video/via/lcd.c
index 980ee1b1dcf313b9dc98a6689b7cac48c702d887..5d21ff436ec80a313dc9133a22b1db08ab7006ae 100644 (file)
--- a/drivers/video/via/lcd.c
+++ b/drivers/video/via/lcd.c
@@ -549,7 +549,7 @@ void viafb_lcd_set_mode(const struct fb_var_screeninfo *var, u16 cxres,
        int panel_hres = plvds_setting_info->lcd_panel_hres;
        int panel_vres = plvds_setting_info->lcd_panel_vres;
        u32 clock;
-       struct display_timing timing;
+       struct via_display_timing timing;
        struct fb_var_screeninfo panel_var;
        const struct fb_videomode *mode_crt_table, *panel_crt_table;
 

diff --git a/drivers/video/via/share.h b/drivers/video/via/share.h
index 3158dfc90bed9126ae6fbd0b2dc034c6f6f0cfa3..65c65c611e0aa583bec01abff384d28d1d6d1dc7 100644 (file)
--- a/drivers/video/via/share.h
+++ b/drivers/video/via/share.h
@@ -319,7 +319,7 @@ struct crt_mode_table {
        int refresh_rate;
        int h_sync_polarity;
        int v_sync_polarity;
-       struct display_timing crtc;
+       struct via_display_timing crtc;
 };
 
 struct io_reg {

diff --git a/drivers/video/via/via_modesetting.c b/drivers/video/via/via_modesetting.c
index 0e431aee17bbcc83a330ffdda6623d477a84ac8f..0b414b09b9b455320dd4d338a946faa3e3cf6ee1 100644 (file)
--- a/drivers/video/via/via_modesetting.c
+++ b/drivers/video/via/via_modesetting.c
@@ -30,9 +30,9 @@
 #include "debug.h"
 
 
-void via_set_primary_timing(const struct display_timing *timing)
+void via_set_primary_timing(const struct via_display_timing *timing)
 {
-       struct display_timing raw;
+       struct via_display_timing raw;
 
        raw.hor_total = timing->hor_total / 8 - 5;
        raw.hor_addr = timing->hor_addr / 8 - 1;
@@ -88,9 +88,9 @@ void via_set_primary_timing(const struct display_timing *timing)
        via_write_reg_mask(VIACR, 0x17, 0x80, 0x80);
 }
 
-void via_set_secondary_timing(const struct display_timing *timing)
+void via_set_secondary_timing(const struct via_display_timing *timing)
 {
-       struct display_timing raw;
+       struct via_display_timing raw;
 
        raw.hor_total = timing->hor_total - 1;
        raw.hor_addr = timing->hor_addr - 1;

diff --git a/drivers/video/via/via_modesetting.h b/drivers/video/via/via_modesetting.h
index 06e09fe351ae86a209b139e88687d1f8f8f9d7e2..f6a6503da3b38b1d37c3c3d92e28d7ef2abd1b72 100644 (file)
--- a/drivers/video/via/via_modesetting.h
+++ b/drivers/video/via/via_modesetting.h
@@ -33,7 +33,7 @@
 #define VIA_PITCH_MAX  0x3FF8
 
 
-struct display_timing {
+struct via_display_timing {
        u16 hor_total;
        u16 hor_addr;
        u16 hor_blank_start;
@@ -49,8 +49,8 @@ struct display_timing {
 };
 
 
-void via_set_primary_timing(const struct display_timing *timing);
-void via_set_secondary_timing(const struct display_timing *timing);
+void via_set_primary_timing(const struct via_display_timing *timing);
+void via_set_secondary_timing(const struct via_display_timing *timing);
 void via_set_primary_address(u32 addr);
 void via_set_secondary_address(u32 addr);
 void via_set_primary_pitch(u32 pitch);