From 6a4cc011d97a4042617a4adb1e4d24a96e3a9962 Mon Sep 17 00:00:00 2001 From: "Javier M. Mellid" Date: Mon, 17 Sep 2012 16:12:49 +0200 Subject: [PATCH] --- yaml --- r: 325379 b: refs/heads/master c: 20d471c447d5fede8d0d2b3618450d9ab8d82da9 h: refs/heads/master i: 325377: 01017cdf0a8ba1c9ebbdef7514d17061cf2304b1 325375: eaca102308de1c3c6db6a2d9f4e40bb8b7542555 v: v3 --- [refs] | 2 +- trunk/drivers/staging/sm7xxfb/sm7xxfb.c | 20 +++++++------------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index 8b1ac004dffa..675bfae87644 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9f6fe04326da5036ab0d01553eacabe9b21d47ae +refs/heads/master: 20d471c447d5fede8d0d2b3618450d9ab8d82da9 diff --git a/trunk/drivers/staging/sm7xxfb/sm7xxfb.c b/trunk/drivers/staging/sm7xxfb/sm7xxfb.c index f6ecac35d495..5ad52b9204b0 100644 --- a/trunk/drivers/staging/sm7xxfb/sm7xxfb.c +++ b/trunk/drivers/staging/sm7xxfb/sm7xxfb.c @@ -679,7 +679,7 @@ static struct fb_ops smtcfb_ops = { }; /* - * alloc struct smtcfb_info and assign the default value + * alloc struct smtcfb_info and assign default values */ static struct smtcfb_info *smtc_alloc_fb_info(struct pci_dev *pdev) { @@ -692,18 +692,12 @@ static struct smtcfb_info *smtc_alloc_fb_info(struct pci_dev *pdev) sfb->pdev = pdev; - /* init sfb->fb with default value */ - - sfb->fb.flags = FBINFO_FLAG_DEFAULT; - sfb->fb.fbops = &smtcfb_ops; - - sfb->fb.fix = smtcfb_fix; - - sfb->fb.var = smtcfb_var; - - sfb->fb.pseudo_palette = sfb->colreg; - - sfb->fb.par = sfb; + sfb->fb.flags = FBINFO_FLAG_DEFAULT; + sfb->fb.fbops = &smtcfb_ops; + sfb->fb.fix = smtcfb_fix; + sfb->fb.var = smtcfb_var; + sfb->fb.pseudo_palette = sfb->colreg; + sfb->fb.par = sfb; return sfb; }