summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Rapoport <mike.rapoport@gmail.com>2015-10-26 09:06:07 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-10-27 17:04:57 +0900
commit823e034c0f18d0571f44ce903dd47fa388706b61 (patch)
tree20d020ddee24125b26affe59089799f2cc1bee05
parente359b6a863e19f2eb5519b31658b4a9cc8812a05 (diff)
staging: sm750fb: remove '#ifdef CAP_EXP*' conditionals
There are several occurencies of '#ifdef CAP_EXP<something>', spelled differently each time. None of these is ever defined and therefore they enclose dead code that can be removed. Signed-off-by: Mike Rapoport <mike.rapoport@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/sm750fb/sm750.c18
1 files changed, 0 insertions, 18 deletions
diff --git a/drivers/staging/sm750fb/sm750.c b/drivers/staging/sm750fb/sm750.c
index 329423d4d6c9..860e1c288ad5 100644
--- a/drivers/staging/sm750fb/sm750.c
+++ b/drivers/staging/sm750fb/sm750.c
@@ -929,14 +929,8 @@ exit:
static void sm750fb_setup(struct sm750_dev *sm750_dev, char *src)
{
char *opt;
-#ifdef CAP_EXPENSION
- char *exp_res;
-#endif
int swap;
-#ifdef CAP_EXPENSIION
- exp_res = NULL;
-#endif
swap = 0;
sm750_dev->initParm.chip_clk = 0;
@@ -968,10 +962,6 @@ static void sm750fb_setup(struct sm750_dev *sm750_dev, char *src)
sm750_dev->pnltype = sm750_dualTFT;
else if (!strncmp(opt, "24bit", strlen("24bit")))
sm750_dev->pnltype = sm750_24TFT;
-#ifdef CAP_EXPANSION
- else if (!strncmp(opt, "exp:", strlen("exp:")))
- exp_res = opt + strlen("exp:");
-#endif
else if (!strncmp(opt, "nohwc0", strlen("nohwc0")))
g_hwcursor &= ~0x1;
else if (!strncmp(opt, "nohwc1", strlen("nohwc1")))
@@ -990,14 +980,6 @@ static void sm750fb_setup(struct sm750_dev *sm750_dev, char *src)
}
}
}
-#ifdef CAP_EXPANSION
- if (getExpRes(exp_res,
- &sm750_dev->xLCD,
- &sm750_dev->yLCD)) {
- /* seems exp_res is not valid */
- sm750_dev->xLCD = sm750_dev->yLCD = 0;
- }
-#endif
NO_PARAM:
if (sm750_dev->revid != SM750LE_REVISION_ID) {