Skip to content

Commit

Permalink
Staging: sm7xx: removing extra white spaces,redundant code and using …
Browse files Browse the repository at this point in the history
…macros

This patch is to remove extra spaces,redundant code and using
ARRAY_SIZE macros.

Signed-off-by: anish kumar <anish198519851985@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
anish kumar authored and Greg Kroah-Hartman committed May 19, 2011
1 parent 2d99036 commit 1639c8a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 10 deletions.
7 changes: 3 additions & 4 deletions drivers/staging/sm7xx/smtcfb.c
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ u16 smtc_ChipIDs[] = {
0x720
};

#define numSMTCchipIDs (sizeof(smtc_ChipIDs) / sizeof(u16))
#define numSMTCchipIDs ARRAY_SIZE(smtc_ChipIDs)

static struct fb_var_screeninfo smtcfb_var = {
.xres = 1024,
Expand Down Expand Up @@ -842,7 +842,7 @@ static int __init sm712vga_setup(char *options)
smdbg("\nsm712vga_setup = %s\n", options);

for (index = 0;
index < (sizeof(vesa_mode) / sizeof(struct vesa_mode_table));
index < ARRAY_SIZE(vesa_mode);
index++) {
if (strstr(options, vesa_mode[index].mode_index)) {
smtc_screen_info.lfb_width = vesa_mode[index].lfb_width;
Expand Down Expand Up @@ -876,7 +876,6 @@ static int __devinit smtcfb_pci_probe(struct pci_dev *pdev,
err = pci_enable_device(pdev); /* enable SMTC chip */
if (err)
return err;
err = -ENOMEM;

hw.chipID = ent->device;
sprintf(name, "sm%Xfb", hw.chipID);
Expand Down Expand Up @@ -1006,7 +1005,7 @@ static int __devinit smtcfb_pci_probe(struct pci_dev *pdev,

return 0;

failed:
failed:
printk(KERN_INFO "Silicon Motion, Inc. primary display init fail\n");

smtc_unmap_smem(sfb);
Expand Down
7 changes: 1 addition & 6 deletions drivers/staging/sm7xx/smtcfb.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,6 @@
#define SCREEN_Y_RES 600
#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 */
#define SM712_VIDEOMEMORYSIZE 0x00400000
/*Assume SM722 graphics chip has 8MB VRAM */
Expand Down Expand Up @@ -790,4 +785,4 @@ struct ModeInit VGAMode[] = {
},
};

#define numVGAModes (sizeof(VGAMode) / sizeof(struct ModeInit))
#define numVGAModes ARRAY_SIZE(VGAMode)

0 comments on commit 1639c8a

Please sign in to comment.