4 files changed, 15 insertions, 14 deletions

diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
index 620c9a934e0e..821c6da8e42c 100644
--- a/drivers/video/aty/aty128fb.c
+++ b/drivers/video/aty/aty128fb.c
@@ -1725,9 +1725,9 @@ static int __init aty128_init(struct pci_dev *pdev, const struct pci_device_id *
         strcpy(video_card, "Rage128 XX ");
         video_card[8] = ent->device >> 8;
         video_card[9] = ent->device & 0xFF;
-            
+
         /* range check to make sure */
-        if (ent->driver_data < (sizeof(r128_family)/sizeof(char *)))
+        if (ent->driver_data < ARRAY_SIZE(r128_family))
             strncat(video_card, r128_family[ent->driver_data], sizeof(video_card));
 
         printk(KERN_INFO "aty128fb: %s [chip rev 0x%x] ", video_card, chip_rev);
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index 485be386a8ff..e799fcca365a 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -434,7 +434,7 @@ static int __devinit correct_chipset(struct atyfb_par *par)
         const char *name;
         int i;
 
-        for (i = sizeof(aty_chips) / sizeof(*aty_chips) - 1; i >= 0; i--)
+        for (i = ARRAY_SIZE(aty_chips) - 1; i >= 0; i--)
                 if (par->pci_id == aty_chips[i].pci_id)
                         break;
 
@@ -2168,10 +2168,10 @@ static void __init aty_calc_mem_refresh(struct atyfb_par *par, int xclk)
 
         if (IS_XL(par->pci_id) || IS_MOBILITY(par->pci_id)) {
                 refresh_tbl = ragexl_tbl;
-                size = sizeof(ragexl_tbl)/sizeof(int);
+                size = ARRAY_SIZE(ragexl_tbl);
         } else {
                 refresh_tbl = ragepro_tbl;
-                size = sizeof(ragepro_tbl)/sizeof(int);
+                size = ARRAY_SIZE(ragepro_tbl);
         }
 
         for (i=0; i < size; i++) {
@@ -2298,6 +2298,10 @@ static int __init aty_init(struct fb_info *info, const char *name)
                 case CLK_ATI18818_1:
                         par->pll_ops = &aty_pll_ati18818_1;
                         break;
+                case CLK_IBMRGB514:
+                        par->pll_ops = &aty_pll_ibm514;
+                        break;
+#if 0 /* dead code */
                 case CLK_STG1703:
                         par->pll_ops = &aty_pll_stg1703;
                         break;
@@ -2307,9 +2311,7 @@ static int __init aty_init(struct fb_info *info, const char *name)
                 case CLK_ATT20C408:
                         par->pll_ops = &aty_pll_att20c408;
                         break;
-                case CLK_IBMRGB514:
-                        par->pll_ops = &aty_pll_ibm514;
-                        break;
+#endif
                 default:
                         PRINTKI("aty_init: CLK type not implemented yet!");
                         par->pll_ops = &aty_pll_unsupported;
@@ -3397,7 +3399,7 @@ static int __devinit atyfb_pci_probe(struct pci_dev *pdev, const struct pci_devi
         struct atyfb_par *par;
         int i, rc = -ENOMEM;
 
-        for (i = sizeof(aty_chips) / sizeof(*aty_chips) - 1; i >= 0; i--)
+        for (i = ARRAY_SIZE(aty_chips); i >= 0; i--)
                 if (pdev->device == aty_chips[i].pci_id)
                         break;
 
diff --git a/drivers/video/aty/mach64_gx.c b/drivers/video/aty/mach64_gx.c
index 01fdff79483b..2045639cb671 100644
--- a/drivers/video/aty/mach64_gx.c
+++ b/drivers/video/aty/mach64_gx.c
@@ -149,8 +149,7 @@ static int aty_var_to_pll_514(const struct fb_info *info, u32 vclk_per,
         };
         int i;
 
-        for (i = 0; i < sizeof(RGB514_clocks) / sizeof(*RGB514_clocks);
-             i++)
+        for (i = 0; i < ARRAY_SIZE(RGB514_clocks); i++)
                 if (vclk_per <= RGB514_clocks[i].limit) {
                         pll->ibm514.m = RGB514_clocks[i].m;
                         pll->ibm514.n = RGB514_clocks[i].n;
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c
index c9f0c5a07e6e..9a6b5b39b88e 100644
--- a/drivers/video/aty/radeon_base.c
+++ b/drivers/video/aty/radeon_base.c
@@ -1067,7 +1067,7 @@ static int radeon_setcolreg (unsigned regno, unsigned red, unsigned green,
 
 
         if (regno > 255)
-                return 1;
+                return -EINVAL;
 
         red >>= 8;
         green >>= 8;
@@ -1086,9 +1086,9 @@ static int radeon_setcolreg (unsigned regno, unsigned red, unsigned green,
                         pindex = regno * 8;
 
                         if (rinfo->depth == 16 && regno > 63)
-                                return 1;
+                                return -EINVAL;
                         if (rinfo->depth == 15 && regno > 31)
-                                return 1;
+                                return -EINVAL;
 
                         /* For 565, the green component is mixed one order
                          * below