diff options
Diffstat (limited to 'drivers/video/sstfb.c')
-rw-r--r-- | drivers/video/sstfb.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/video/sstfb.c b/drivers/video/sstfb.c index 8c1a8b5135c6..c44de90ca12e 100644 --- a/drivers/video/sstfb.c +++ b/drivers/video/sstfb.c | |||
@@ -1194,10 +1194,11 @@ static struct dac_switch dacs[] __devinitdata = { | |||
1194 | static int __devinit sst_detect_dactype(struct fb_info *info, struct sstfb_par *par) | 1194 | static int __devinit sst_detect_dactype(struct fb_info *info, struct sstfb_par *par) |
1195 | { | 1195 | { |
1196 | int i, ret = 0; | 1196 | int i, ret = 0; |
1197 | 1197 | ||
1198 | for (i=0; i<sizeof(dacs)/sizeof(dacs[0]); i++) { | 1198 | for (i = 0; i < ARRAY_SIZE(dacs); i++) { |
1199 | ret = dacs[i].detect(info); | 1199 | ret = dacs[i].detect(info); |
1200 | if (ret) break; | 1200 | if (ret) |
1201 | break; | ||
1201 | } | 1202 | } |
1202 | if (!ret) | 1203 | if (!ret) |
1203 | return 0; | 1204 | return 0; |
@@ -1604,8 +1605,8 @@ static int sstfb_dump_regs(struct fb_info *info) | |||
1604 | {FBZMODE,"fbzmode"}, | 1605 | {FBZMODE,"fbzmode"}, |
1605 | }; | 1606 | }; |
1606 | 1607 | ||
1607 | const int pci_s = sizeof(pci_regs)/sizeof(pci_regs[0]); | 1608 | const int pci_s = ARRAY_SIZE(pci_regs); |
1608 | const int sst_s = sizeof(sst_regs)/sizeof(sst_regs[0]); | 1609 | const int sst_s = ARRAY_SIZE(sst_regs); |
1609 | struct sstfb_par *par = info->par; | 1610 | struct sstfb_par *par = info->par; |
1610 | struct pci_dev *dev = par->dev; | 1611 | struct pci_dev *dev = par->dev; |
1611 | u32 pci_res[pci_s]; | 1612 | u32 pci_res[pci_s]; |