Skip to content

Commit

Permalink
staging/xgifb: Remove assignments without effect
Browse files Browse the repository at this point in the history
This patch removes assignments to the fb_fix_screeninfo struct which are
overwritten by the memset in XGIfb_get_fix() a few lines later.
Since the name/id might be useful this was moved to XGIfb_get_fix().

Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Peter Huewe authored and Greg Kroah-Hartman committed Jun 14, 2012
1 parent 15d7644 commit 176f784
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions drivers/staging/xgifb/XGI_main_26.c
Original file line number Diff line number Diff line change
Expand Up @@ -1348,6 +1348,8 @@ static int XGIfb_get_fix(struct fb_fix_screeninfo *fix, int con,
DEBUGPRN("inside get_fix");
memset(fix, 0, sizeof(struct fb_fix_screeninfo));

strncpy(fix->id, "XGI", sizeof(fix->id) - 1);

fix->smem_start = xgifb_info->video_base;

fix->smem_len = xgifb_info->video_size;
Expand Down Expand Up @@ -2230,11 +2232,6 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,

}

strncpy(fb_info->fix.id, "XGI", sizeof(fb_info->fix.id) - 1);
fb_info->fix.type = FB_TYPE_PACKED_PIXELS;
fb_info->fix.xpanstep = 1;
fb_info->fix.ypanstep = 1;

fb_info->flags = FBINFO_FLAG_DEFAULT;
fb_info->screen_base = xgifb_info->video_vbase;
fb_info->fbops = &XGIfb_ops;
Expand Down

0 comments on commit 176f784

Please sign in to comment.