diff options
author | Mike Rapoport <mike.rapoport@gmail.com> | 2015-10-26 09:05:57 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-27 17:04:57 +0900 |
commit | 1757d106a9ce8cc299ffbc3cb87711ab72f95af6 (patch) | |
tree | 6fa07f6f7e688d0e43eee957b0f66fd179c55933 /drivers/staging/sm750fb/sm750.c | |
parent | 5ef2f688578c5de8231ae325f5dff8cfe970d2da (diff) | |
download | linux-1757d106a9ce8cc299ffbc3cb87711ab72f95af6.tar.bz2 |
staging: sm750fb: merge struct sm750_state into struct sm750_dev
The struct sm750_state is never used on its own. Merge it into the
struct sm750_dev.
Signed-off-by: Mike Rapoport <mike.rapoport@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/sm750fb/sm750.c')
-rw-r--r-- | drivers/staging/sm750fb/sm750.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/drivers/staging/sm750fb/sm750.c b/drivers/staging/sm750fb/sm750.c index 2f3e35c30df0..ad20a8aacad2 100644 --- a/drivers/staging/sm750fb/sm750.c +++ b/drivers/staging/sm750fb/sm750.c @@ -676,7 +676,7 @@ static int sm750fb_set_drv(struct lynxfb_par *par) /* chip specific phase */ share->accel.de_wait = (share->revid == SM750LE_REVISION_ID) ? hw_sm750le_deWait : hw_sm750_deWait; - switch (sm750_dev->state.dataflow) { + switch (sm750_dev->dataflow) { case sm750_simul_pri: output->paths = sm750_pnc; crtc->channel = sm750_primary; @@ -950,12 +950,12 @@ static void sm750fb_setup(struct lynx_share *share, char *src) #endif swap = 0; - sm750_dev->state.initParm.chip_clk = 0; - sm750_dev->state.initParm.mem_clk = 0; - sm750_dev->state.initParm.master_clk = 0; - sm750_dev->state.initParm.powerMode = 0; - sm750_dev->state.initParm.setAllEngOff = 0; - sm750_dev->state.initParm.resetMemory = 1; + sm750_dev->initParm.chip_clk = 0; + sm750_dev->initParm.mem_clk = 0; + sm750_dev->initParm.master_clk = 0; + sm750_dev->initParm.powerMode = 0; + sm750_dev->initParm.setAllEngOff = 0; + sm750_dev->initParm.resetMemory = 1; /* defaultly turn g_hwcursor on for both view */ g_hwcursor = 3; @@ -972,13 +972,13 @@ static void sm750fb_setup(struct lynx_share *share, char *src) if (!strncmp(opt, "swap", strlen("swap"))) swap = 1; else if (!strncmp(opt, "nocrt", strlen("nocrt"))) - sm750_dev->state.nocrt = 1; + sm750_dev->nocrt = 1; else if (!strncmp(opt, "36bit", strlen("36bit"))) - sm750_dev->state.pnltype = sm750_doubleTFT; + sm750_dev->pnltype = sm750_doubleTFT; else if (!strncmp(opt, "18bit", strlen("18bit"))) - sm750_dev->state.pnltype = sm750_dualTFT; + sm750_dev->pnltype = sm750_dualTFT; else if (!strncmp(opt, "24bit", strlen("24bit"))) - sm750_dev->state.pnltype = sm750_24TFT; + sm750_dev->pnltype = sm750_24TFT; #ifdef CAP_EXPANSION else if (!strncmp(opt, "exp:", strlen("exp:"))) exp_res = opt + strlen("exp:"); @@ -1003,10 +1003,10 @@ static void sm750fb_setup(struct lynx_share *share, char *src) } #ifdef CAP_EXPANSION if (getExpRes(exp_res, - &sm750_dev->state.xLCD, - &sm750_dev->state.yLCD)) { + &sm750_dev->xLCD, + &sm750_dev->yLCD)) { /* seems exp_res is not valid */ - sm750_dev->state.xLCD = sm750_dev->state.yLCD = 0; + sm750_dev->xLCD = sm750_dev->yLCD = 0; } #endif @@ -1014,20 +1014,20 @@ NO_PARAM: if (share->revid != SM750LE_REVISION_ID) { if (share->dual) { if (swap) - sm750_dev->state.dataflow = sm750_dual_swap; + sm750_dev->dataflow = sm750_dual_swap; else - sm750_dev->state.dataflow = sm750_dual_normal; + sm750_dev->dataflow = sm750_dual_normal; } else { if (swap) - sm750_dev->state.dataflow = sm750_simul_sec; + sm750_dev->dataflow = sm750_simul_sec; else - sm750_dev->state.dataflow = sm750_simul_pri; + sm750_dev->dataflow = sm750_simul_pri; } } else { /* SM750LE only have one crt channel */ - sm750_dev->state.dataflow = sm750_simul_sec; + sm750_dev->dataflow = sm750_simul_sec; /* sm750le do not have complex attributes */ - sm750_dev->state.nocrt = 0; + sm750_dev->nocrt = 0; } } |