diff options
author | Tobias Klauser <tklauser@nuerscht.ch> | 2006-03-27 04:17:39 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-27 11:44:58 -0500 |
commit | d1ae418eef4ce763a95edec0b5fc095af5daca2e (patch) | |
tree | 251158f7887435cd058293c2532eafd722adff3a /drivers/video/aty | |
parent | b0c87978216836455ef5fbcac6df1ce6679750b0 (diff) |
[PATCH] drivers/video: Use ARRAY_SIZE macro
Use ARRAY_SIZE macro instead of sizeof(x)/sizeof(x[0]) and remove
duplicates of ARRAY_SIZE. Some coding style and trailing whitespaces are
also fixed.
Compile-tested where possible (some are other arch or BROKEN)
Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video/aty')
-rw-r--r-- | drivers/video/aty/aty128fb.c | 4 | ||||
-rw-r--r-- | drivers/video/aty/atyfb_base.c | 8 | ||||
-rw-r--r-- | drivers/video/aty/mach64_gx.c | 3 |
3 files changed, 7 insertions, 8 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 * | |||
1725 | strcpy(video_card, "Rage128 XX "); | 1725 | strcpy(video_card, "Rage128 XX "); |
1726 | video_card[8] = ent->device >> 8; | 1726 | video_card[8] = ent->device >> 8; |
1727 | video_card[9] = ent->device & 0xFF; | 1727 | video_card[9] = ent->device & 0xFF; |
1728 | 1728 | ||
1729 | /* range check to make sure */ | 1729 | /* range check to make sure */ |
1730 | if (ent->driver_data < (sizeof(r128_family)/sizeof(char *))) | 1730 | if (ent->driver_data < ARRAY_SIZE(r128_family)) |
1731 | strncat(video_card, r128_family[ent->driver_data], sizeof(video_card)); | 1731 | strncat(video_card, r128_family[ent->driver_data], sizeof(video_card)); |
1732 | 1732 | ||
1733 | printk(KERN_INFO "aty128fb: %s [chip rev 0x%x] ", video_card, chip_rev); | 1733 | 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 d790ee76cc70..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) | |||
434 | const char *name; | 434 | const char *name; |
435 | int i; | 435 | int i; |
436 | 436 | ||
437 | for (i = sizeof(aty_chips) / sizeof(*aty_chips) - 1; i >= 0; i--) | 437 | for (i = ARRAY_SIZE(aty_chips) - 1; i >= 0; i--) |
438 | if (par->pci_id == aty_chips[i].pci_id) | 438 | if (par->pci_id == aty_chips[i].pci_id) |
439 | break; | 439 | break; |
440 | 440 | ||
@@ -2168,10 +2168,10 @@ static void __init aty_calc_mem_refresh(struct atyfb_par *par, int xclk) | |||
2168 | 2168 | ||
2169 | if (IS_XL(par->pci_id) || IS_MOBILITY(par->pci_id)) { | 2169 | if (IS_XL(par->pci_id) || IS_MOBILITY(par->pci_id)) { |
2170 | refresh_tbl = ragexl_tbl; | 2170 | refresh_tbl = ragexl_tbl; |
2171 | size = sizeof(ragexl_tbl)/sizeof(int); | 2171 | size = ARRAY_SIZE(ragexl_tbl); |
2172 | } else { | 2172 | } else { |
2173 | refresh_tbl = ragepro_tbl; | 2173 | refresh_tbl = ragepro_tbl; |
2174 | size = sizeof(ragepro_tbl)/sizeof(int); | 2174 | size = ARRAY_SIZE(ragepro_tbl); |
2175 | } | 2175 | } |
2176 | 2176 | ||
2177 | for (i=0; i < size; i++) { | 2177 | for (i=0; i < size; i++) { |
@@ -3399,7 +3399,7 @@ static int __devinit atyfb_pci_probe(struct pci_dev *pdev, const struct pci_devi | |||
3399 | struct atyfb_par *par; | 3399 | struct atyfb_par *par; |
3400 | int i, rc = -ENOMEM; | 3400 | int i, rc = -ENOMEM; |
3401 | 3401 | ||
3402 | for (i = sizeof(aty_chips) / sizeof(*aty_chips) - 1; i >= 0; i--) | 3402 | for (i = ARRAY_SIZE(aty_chips); i >= 0; i--) |
3403 | if (pdev->device == aty_chips[i].pci_id) | 3403 | if (pdev->device == aty_chips[i].pci_id) |
3404 | break; | 3404 | break; |
3405 | 3405 | ||
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, | |||
149 | }; | 149 | }; |
150 | int i; | 150 | int i; |
151 | 151 | ||
152 | for (i = 0; i < sizeof(RGB514_clocks) / sizeof(*RGB514_clocks); | 152 | for (i = 0; i < ARRAY_SIZE(RGB514_clocks); i++) |
153 | i++) | ||
154 | if (vclk_per <= RGB514_clocks[i].limit) { | 153 | if (vclk_per <= RGB514_clocks[i].limit) { |
155 | pll->ibm514.m = RGB514_clocks[i].m; | 154 | pll->ibm514.m = RGB514_clocks[i].m; |
156 | pll->ibm514.n = RGB514_clocks[i].n; | 155 | pll->ibm514.n = RGB514_clocks[i].n; |