From: Aaro Koskinen <aaro.koskinen@iki.fi>
To: apatard@mandriva.com, gregkh@suse.de, devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 07/12] staging: xgifb: eliminate #ifdef XGIFB_PAN
Date: Fri, 19 Aug 2011 22:40:25 +0300 [thread overview]
Message-ID: <1313782830-31461-8-git-send-email-aaro.koskinen@iki.fi> (raw)
In-Reply-To: <1313782830-31461-1-git-send-email-aaro.koskinen@iki.fi>
XGIFB_PAN is always defined and checks can be eliminated.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
---
drivers/staging/xgifb/XGI_main_26.c | 12 ------------
1 files changed, 0 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c
index 0636300..cc4127f 100644
--- a/drivers/staging/xgifb/XGI_main_26.c
+++ b/drivers/staging/xgifb/XGI_main_26.c
@@ -28,10 +28,6 @@
#include <linux/types.h>
#include <linux/proc_fs.h>
-#ifndef XGIFB_PAN
-#define XGIFB_PAN
-#endif
-
#include <linux/io.h>
#ifdef CONFIG_MTRR
#include <asm/mtrr.h>
@@ -1361,7 +1357,6 @@ static int XGIfb_do_set_var(struct fb_var_screeninfo *var, int isactive,
return 0;
}
-#ifdef XGIFB_PAN
static int XGIfb_pan_var(struct fb_var_screeninfo *var)
{
unsigned int base;
@@ -1414,7 +1409,6 @@ static int XGIfb_pan_var(struct fb_var_screeninfo *var)
/* printk("End of pan_var"); */
return 0;
}
-#endif
static int XGIfb_open(struct fb_info *info, int user)
{
@@ -1500,10 +1494,8 @@ static int XGIfb_get_fix(struct fb_fix_screeninfo *fix, int con,
else
fix->visual = FB_VISUAL_DIRECTCOLOR;
fix->xpanstep = 0;
-#ifdef XGIFB_PAN
if (XGIfb_ypan)
fix->ypanstep = 1;
-#endif
fix->ywrapstep = 0;
fix->line_length = xgi_video_info.video_linelength;
fix->mmio_start = xgi_video_info.mmio_base;
@@ -1671,7 +1663,6 @@ static int XGIfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
return 0;
}
-#ifdef XGIFB_PAN
static int XGIfb_pan_display(struct fb_var_screeninfo *var,
struct fb_info *info)
{
@@ -1708,7 +1699,6 @@ static int XGIfb_pan_display(struct fb_var_screeninfo *var,
/* printk("End of pan_display\n"); */
return 0;
}
-#endif
static int XGIfb_blank(int blank, struct fb_info *info)
{
@@ -1734,9 +1724,7 @@ static struct fb_ops XGIfb_ops = {
.fb_check_var = XGIfb_check_var,
.fb_set_par = XGIfb_set_par,
.fb_setcolreg = XGIfb_setcolreg,
-#ifdef XGIFB_PAN
.fb_pan_display = XGIfb_pan_display,
-#endif
.fb_blank = XGIfb_blank,
.fb_fillrect = cfb_fillrect,
.fb_copyarea = cfb_copyarea,
--
1.7.2.5
next prev parent reply other threads:[~2011-08-19 19:42 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-19 19:40 [PATCH 00/12] staging: xgifb: misc cleanups Aaro Koskinen
2011-08-19 19:40 ` [PATCH 01/12] staging: xgifb: eliminate #ifdef NewScratch Aaro Koskinen
2011-08-20 16:50 ` Dan Carpenter
2011-08-19 19:40 ` [PATCH 02/12] staging: xgifb: eliminate XGIINITSTATIC Aaro Koskinen
2011-08-19 19:40 ` [PATCH 03/12] staging: xgifb: delete duplicate #defines Aaro Koskinen
2011-08-19 19:40 ` [PATCH 04/12] staging: xgifb: delete unused definitions Aaro Koskinen
2011-08-19 19:40 ` [PATCH 05/12] staging: xgifb: vb_table: delete unused data Aaro Koskinen
2011-08-19 19:40 ` [PATCH 06/12] staging: xgifb: delete unused structs Aaro Koskinen
2011-08-19 19:40 ` Aaro Koskinen [this message]
2011-08-19 19:40 ` [PATCH 08/12] staging: xgifb: probe: delete checks for mode "none" Aaro Koskinen
2011-08-19 19:40 ` [PATCH 09/12] staging: xgifb: replace video_type with FB_TYPE_PACKED_PIXELS Aaro Koskinen
2011-08-19 19:40 ` [PATCH 10/12] staging: xgifb: delete write-only variables Aaro Koskinen
2011-08-19 19:40 ` [PATCH 11/12] staging: xgifb: delete driver version information Aaro Koskinen
2011-08-19 19:40 ` [PATCH 12/12] staging: xgifb: delete an empty string Aaro Koskinen
2011-08-23 21:24 ` Greg KH
2011-08-20 16:51 ` [PATCH 00/12] staging: xgifb: misc cleanups Dan Carpenter
2011-08-23 21:20 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1313782830-31461-8-git-send-email-aaro.koskinen@iki.fi \
--to=aaro.koskinen@iki.fi \
--cc=apatard@mandriva.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@suse.de \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®