1 files changed, 18 insertions, 35 deletions

diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index f8d69ad36830..d7aaec5667bf 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -248,10 +248,6 @@ static int atyfb_sync(struct fb_info *info);
 
 static int aty_init(struct fb_info *info);
 
-#ifdef CONFIG_ATARI
-static int store_video_par(char *videopar, unsigned char m64_num);
-#endif
-
 static void aty_get_crtc(const struct atyfb_par *par, struct crtc *crtc);
 
 static void aty_set_crtc(const struct atyfb_par *par, const struct crtc *crtc);
@@ -2069,7 +2065,7 @@ static int atyfb_pci_suspend(struct pci_dev *pdev, pm_message_t state)
         if (state.event == pdev->dev.power.power_state.event)
                 return 0;
 
-        acquire_console_sem();
+        console_lock();
 
         fb_set_suspend(info, 1);
 
@@ -2097,14 +2093,14 @@ static int atyfb_pci_suspend(struct pci_dev *pdev, pm_message_t state)
                 par->lock_blank = 0;
                 atyfb_blank(FB_BLANK_UNBLANK, info);
                 fb_set_suspend(info, 0);
-                release_console_sem();
+                console_unlock();
                 return -EIO;
         }
 #else
         pci_set_power_state(pdev, pci_choose_state(pdev, state));
 #endif
 
-        release_console_sem();
+        console_unlock();
 
         pdev->dev.power.power_state = state;
 
@@ -2133,7 +2129,7 @@ static int atyfb_pci_resume(struct pci_dev *pdev)
         if (pdev->dev.power.power_state.event == PM_EVENT_ON)
                 return 0;
 
-        acquire_console_sem();
+        console_lock();
 
         /*
          * PCI state will have been restored by the core, so
@@ -2161,7 +2157,7 @@ static int atyfb_pci_resume(struct pci_dev *pdev)
         par->lock_blank = 0;
         atyfb_blank(FB_BLANK_UNBLANK, info);
 
-        release_console_sem();
+        console_unlock();
 
         pdev->dev.power.power_state = PMSG_ON;
 
@@ -2221,7 +2217,7 @@ static int aty_bl_get_brightness(struct backlight_device *bd)
         return bd->props.brightness;
 }
 
-static struct backlight_ops aty_bl_data = {
+static const struct backlight_ops aty_bl_data = {
         .get_brightness = aty_bl_get_brightness,
         .update_status  = aty_bl_update_status,
 };
@@ -2241,6 +2237,7 @@ static void aty_bl_init(struct atyfb_par *par)
         snprintf(name, sizeof(name), "atybl%d", info->node);
 
         memset(&props, 0, sizeof(struct backlight_properties));
+        props.type = BACKLIGHT_RAW;
         props.max_brightness = FB_BACKLIGHT_LEVELS - 1;
         bd = backlight_device_register(name, info->dev, par, &aty_bl_data,
                                        &props);
@@ -2267,11 +2264,13 @@ error:
         return;
 }
 
+#ifdef CONFIG_PCI
 static void aty_bl_exit(struct backlight_device *bd)
 {
         backlight_device_unregister(bd);
         printk("aty: Backlight unloaded\n");
 }
+#endif /* CONFIG_PCI */
 
 #endif /* CONFIG_FB_ATY_BACKLIGHT */
 
@@ -2788,7 +2787,7 @@ aty_init_exit:
         return ret;
 }
 
-#ifdef CONFIG_ATARI
+#if defined(CONFIG_ATARI) && !defined(MODULE)
 static int __devinit store_video_par(char *video_str, unsigned char m64_num)
 {
         char *p;
@@ -2817,7 +2816,7 @@ static int __devinit store_video_par(char *video_str, unsigned char m64_num)
         phys_vmembase[m64_num] = 0;
         return -1;
 }
-#endif /* CONFIG_ATARI */
+#endif /* CONFIG_ATARI && !MODULE */
 
 /*
  * Blank the display.
@@ -2969,9 +2968,8 @@ static int __devinit atyfb_setup_sparc(struct pci_dev *pdev,
 {
         struct atyfb_par *par = info->par;
         struct device_node *dp;
-        char prop[128];
-        int node, len, i, j, ret;
         u32 mem, chip_id;
+        int i, j, ret;
 
         /*
          * Map memory-mapped registers.
@@ -3087,23 +3085,8 @@ static int __devinit atyfb_setup_sparc(struct pci_dev *pdev,
                 aty_st_le32(MEM_CNTL, mem, par);
         }
 
-        /*
-         * If this is the console device, we will set default video
-         * settings to what the PROM left us with.
-         */
-        node = prom_getchild(prom_root_node);
-        node = prom_searchsiblings(node, "aliases");
-        if (node) {
-                len = prom_getproperty(node, "screen", prop, sizeof(prop));
-                if (len > 0) {
-                        prop[len] = '\0';
-                        node = prom_finddevice(prop);
-                } else
-                        node = 0;
-        }
-
         dp = pci_device_to_OF_node(pdev);
-        if (node == dp->phandle) {
+        if (dp == of_console_device) {
                 struct fb_var_screeninfo *var = &default_var;
                 unsigned int N, P, Q, M, T, R;
                 u32 v_total, h_total;
@@ -3111,9 +3094,9 @@ static int __devinit atyfb_setup_sparc(struct pci_dev *pdev,
                 u8 pll_regs[16];
                 u8 clock_cntl;
 
-                crtc.vxres = prom_getintdefault(node, "width", 1024);
-                crtc.vyres = prom_getintdefault(node, "height", 768);
-                var->bits_per_pixel = prom_getintdefault(node, "depth", 8);
+                crtc.vxres = of_getintprop_default(dp, "width", 1024);
+                crtc.vyres = of_getintprop_default(dp, "height", 768);
+                var->bits_per_pixel = of_getintprop_default(dp, "depth", 8);
                 var->xoffset = var->yoffset = 0;
                 crtc.h_tot_disp = aty_ld_le32(CRTC_H_TOTAL_DISP, par);
                 crtc.h_sync_strt_wid = aty_ld_le32(CRTC_H_SYNC_STRT_WID, par);
@@ -3139,12 +3122,12 @@ static int __devinit atyfb_setup_sparc(struct pci_dev *pdev,
                 M = pll_regs[2];
 
                 /*
-                 * PLL Feedback Divider N (Dependant on CLOCK_CNTL):
+                 * PLL Feedback Divider N (Dependent on CLOCK_CNTL):
                  */
                 N = pll_regs[7 + (clock_cntl & 3)];
 
                 /*
-                 * PLL Post Divider P (Dependant on CLOCK_CNTL):
+                 * PLL Post Divider P (Dependent on CLOCK_CNTL):
                  */
                 P = 1 << (pll_regs[6] >> ((clock_cntl & 3) << 1));