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>

diff --git a/drivers/staging/sm750fb/sm750.c b/drivers/staging/sm750fb/sm750.c
index 2f3e35c30df074de1c5d4562a54307a2a42817b0..ad20a8aacad255f5969e74d0f91d0b813e730820 100644 (file)
--- 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;
        }
 }
 

diff --git a/drivers/staging/sm750fb/sm750.h b/drivers/staging/sm750fb/sm750.h
index dd175be246f59d2127ba235461ae72f0e6969105..248fc3ae3b9383a74c74fe2f4eafe9969d4717c6 100644 (file)
--- a/drivers/staging/sm750fb/sm750.h
+++ b/drivers/staging/sm750fb/sm750.h
@@ -47,15 +47,6 @@ struct init_status {
        ushort resetMemory;
 };
 
-struct sm750_state {
-       struct init_status initParm;
-       enum sm750_pnltype pnltype;
-       enum sm750_dataflow dataflow;
-       int nocrt;
-       int xLCD;
-       int yLCD;
-};
-
 struct lynx_accel {
        /* base virtual address of DPR registers */
        volatile unsigned char __iomem *dprBase;
@@ -113,7 +104,13 @@ struct lynx_share {
  */
 struct sm750_dev {
        struct lynx_share share;
-       struct sm750_state state;
+
+       struct init_status initParm;
+       enum sm750_pnltype pnltype;
+       enum sm750_dataflow dataflow;
+       int nocrt;
+       int xLCD;
+       int yLCD;
 
        /*
         * 0: no hardware cursor

diff --git a/drivers/staging/sm750fb/sm750_hw.c b/drivers/staging/sm750fb/sm750_hw.c
index 06782bb7b9201bf16fd78734b8de06854984b655..a952dadb9a4a52fd0fe82db40672654b418825cc 100644 (file)
--- a/drivers/staging/sm750fb/sm750_hw.c
+++ b/drivers/staging/sm750fb/sm750_hw.c
@@ -97,7 +97,7 @@ int hw_sm750_inithw(struct lynx_share *share, struct pci_dev *pdev)
        struct init_status *parm;
 
        sm750_dev = container_of(share, struct sm750_dev, share);
-       parm = &sm750_dev->state.initParm;
+       parm = &sm750_dev->initParm;
        if (parm->chip_clk == 0)
                parm->chip_clk = (getChipType() == SM750LE) ?
                                                DEFAULT_SM750LE_CHIP_CLOCK :
@@ -108,7 +108,7 @@ int hw_sm750_inithw(struct lynx_share *share, struct pci_dev *pdev)
        if (parm->master_clk == 0)
                parm->master_clk = parm->chip_clk/3;
 
-       ddk750_initHw((initchip_param_t *)&sm750_dev->state.initParm);
+       ddk750_initHw((initchip_param_t *)&sm750_dev->initParm);
        /* for sm718,open pci burst */
        if (share->devid == 0x718) {
                POKE32(SYSTEM_CTRL,
@@ -117,7 +117,7 @@ int hw_sm750_inithw(struct lynx_share *share, struct pci_dev *pdev)
 
        if (getChipType() != SM750LE) {
                /* does user need CRT ?*/
-               if (sm750_dev->state.nocrt) {
+               if (sm750_dev->nocrt) {
                        POKE32(MISC_CTRL,
                                        FIELD_SET(PEEK32(MISC_CTRL),
                                        MISC_CTRL,
@@ -139,7 +139,7 @@ int hw_sm750_inithw(struct lynx_share *share, struct pci_dev *pdev)
                                        DPMS, VPHP));
                }
 
-               switch (sm750_dev->state.pnltype) {
+               switch (sm750_dev->pnltype) {
                case sm750_doubleTFT:
                case sm750_24TFT:
                case sm750_dualTFT:
@@ -147,7 +147,7 @@ int hw_sm750_inithw(struct lynx_share *share, struct pci_dev *pdev)
                        FIELD_VALUE(PEEK32(PANEL_DISPLAY_CTRL),
                                                PANEL_DISPLAY_CTRL,
                                                TFT_DISP,
-                                               sm750_dev->state.pnltype));
+                                               sm750_dev->pnltype));
                break;
                }
        } else {