Commit 1639c8ab authored by anish kumar's avatar anish kumar Committed by Greg Kroah-Hartman

Staging: sm7xx: removing extra white spaces,redundant code and using macros

This patch is to remove extra spaces,redundant code and using
ARRAY_SIZE macros.
Signed-off-by: default avataranish kumar <anish198519851985@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 2d990362
...@@ -128,7 +128,7 @@ u16 smtc_ChipIDs[] = { ...@@ -128,7 +128,7 @@ u16 smtc_ChipIDs[] = {
0x720 0x720
}; };
#define numSMTCchipIDs (sizeof(smtc_ChipIDs) / sizeof(u16)) #define numSMTCchipIDs ARRAY_SIZE(smtc_ChipIDs)
static struct fb_var_screeninfo smtcfb_var = { static struct fb_var_screeninfo smtcfb_var = {
.xres = 1024, .xres = 1024,
...@@ -842,7 +842,7 @@ static int __init sm712vga_setup(char *options) ...@@ -842,7 +842,7 @@ static int __init sm712vga_setup(char *options)
smdbg("\nsm712vga_setup = %s\n", options); smdbg("\nsm712vga_setup = %s\n", options);
for (index = 0; for (index = 0;
index < (sizeof(vesa_mode) / sizeof(struct vesa_mode_table)); index < ARRAY_SIZE(vesa_mode);
index++) { index++) {
if (strstr(options, vesa_mode[index].mode_index)) { if (strstr(options, vesa_mode[index].mode_index)) {
smtc_screen_info.lfb_width = vesa_mode[index].lfb_width; smtc_screen_info.lfb_width = vesa_mode[index].lfb_width;
...@@ -876,7 +876,6 @@ static int __devinit smtcfb_pci_probe(struct pci_dev *pdev, ...@@ -876,7 +876,6 @@ static int __devinit smtcfb_pci_probe(struct pci_dev *pdev,
err = pci_enable_device(pdev); /* enable SMTC chip */ err = pci_enable_device(pdev); /* enable SMTC chip */
if (err) if (err)
return err; return err;
err = -ENOMEM;
hw.chipID = ent->device; hw.chipID = ent->device;
sprintf(name, "sm%Xfb", hw.chipID); sprintf(name, "sm%Xfb", hw.chipID);
...@@ -1006,7 +1005,7 @@ static int __devinit smtcfb_pci_probe(struct pci_dev *pdev, ...@@ -1006,7 +1005,7 @@ static int __devinit smtcfb_pci_probe(struct pci_dev *pdev,
return 0; return 0;
failed: failed:
printk(KERN_INFO "Silicon Motion, Inc. primary display init fail\n"); printk(KERN_INFO "Silicon Motion, Inc. primary display init fail\n");
smtc_unmap_smem(sfb); smtc_unmap_smem(sfb);
......
...@@ -30,11 +30,6 @@ ...@@ -30,11 +30,6 @@
#define SCREEN_Y_RES 600 #define SCREEN_Y_RES 600
#define SCREEN_BPP 16 #define SCREEN_BPP 16
#ifndef FIELD_OFFSET
#define FIELD_OFSFET(type, field) \
((unsigned long) (PUCHAR) & (((type *)0)->field))
#endif
/*Assume SM712 graphics chip has 4MB VRAM */ /*Assume SM712 graphics chip has 4MB VRAM */
#define SM712_VIDEOMEMORYSIZE 0x00400000 #define SM712_VIDEOMEMORYSIZE 0x00400000
/*Assume SM722 graphics chip has 8MB VRAM */ /*Assume SM722 graphics chip has 8MB VRAM */
...@@ -790,4 +785,4 @@ struct ModeInit VGAMode[] = { ...@@ -790,4 +785,4 @@ struct ModeInit VGAMode[] = {
}, },
}; };
#define numVGAModes (sizeof(VGAMode) / sizeof(struct ModeInit)) #define numVGAModes ARRAY_SIZE(VGAMode)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment