Merge 5.14-rc6 into staging-next

[linux-2.6-microblaze.git] / drivers / staging / sm750fb / sm750_hw.c

diff --git a/drivers/staging/sm750fb/sm750_hw.c b/drivers/staging/sm750fb/sm750_hw.c
index 7136d75..a7c6eb0 100644 (file)
--- a/drivers/staging/sm750fb/sm750_hw.c
+++ b/drivers/staging/sm750fb/sm750_hw.c
@@ -32,7 +32,7 @@ int hw_sm750_map(struct sm750_dev *sm750_dev, struct pci_dev *pdev)
 
        ret = 0;
 
-       sm750_dev->vidreg_start  = pci_resource_start(pdev, 1);
+       sm750_dev->vidreg_start = pci_resource_start(pdev, 1);
        sm750_dev->vidreg_size = SZ_2M;
 
        pr_info("mmio phyAddr = %lx\n", sm750_dev->vidreg_start);
@@ -50,8 +50,8 @@ int hw_sm750_map(struct sm750_dev *sm750_dev, struct pci_dev *pdev)
        }
 
        /* now map mmio and vidmem */
-       sm750_dev->pvReg = ioremap(sm750_dev->vidreg_start,
-                                  sm750_dev->vidreg_size);
+       sm750_dev->pvReg =
+               ioremap(sm750_dev->vidreg_start, sm750_dev->vidreg_size);
        if (!sm750_dev->pvReg) {
                pr_err("mmio failed\n");
                ret = -EFAULT;
@@ -78,8 +78,8 @@ int hw_sm750_map(struct sm750_dev *sm750_dev, struct pci_dev *pdev)
                sm750_dev->vidmem_start, sm750_dev->vidmem_size);
 
        /* reserve the vidmem space of smi adaptor */
-       sm750_dev->pvMem = ioremap_wc(sm750_dev->vidmem_start,
-                                     sm750_dev->vidmem_size);
+       sm750_dev->pvMem =
+               ioremap_wc(sm750_dev->vidmem_start, sm750_dev->vidmem_size);
        if (!sm750_dev->pvMem) {
                pr_err("Map video memory failed\n");
                ret = -EFAULT;
@@ -98,8 +98,8 @@ int hw_sm750_inithw(struct sm750_dev *sm750_dev, struct pci_dev *pdev)
        parm = &sm750_dev->initParm;
        if (parm->chip_clk == 0)
                parm->chip_clk = (sm750_get_chip_type() == SM750LE) ?
-                                               DEFAULT_SM750LE_CHIP_CLOCK :
-                                               DEFAULT_SM750_CHIP_CLOCK;
+                                              DEFAULT_SM750LE_CHIP_CLOCK :
+                                              DEFAULT_SM750_CHIP_CLOCK;
 
        if (parm->mem_clk == 0)
                parm->mem_clk = parm->chip_clk;
@@ -133,8 +133,8 @@ int hw_sm750_inithw(struct sm750_dev *sm750_dev, struct pci_dev *pdev)
                }
 
                val = peek32(PANEL_DISPLAY_CTRL) &
-                       ~(PANEL_DISPLAY_CTRL_DUAL_DISPLAY |
-                         PANEL_DISPLAY_CTRL_DOUBLE_PIXEL);
+                     ~(PANEL_DISPLAY_CTRL_DUAL_DISPLAY |
+                       PANEL_DISPLAY_CTRL_DOUBLE_PIXEL);
                switch (sm750_dev->pnltype) {
                case sm750_24TFT:
                        break;
@@ -281,12 +281,12 @@ int hw_sm750_crtc_setMode(struct lynxfb_crtc *crtc,
 
        /* set timing */
        modparm.pixel_clock = ps_to_hz(var->pixclock);
-       modparm.vertical_sync_polarity = (var->sync & FB_SYNC_HOR_HIGH_ACT)
-                                        ? POS : NEG;
-       modparm.horizontal_sync_polarity = (var->sync & FB_SYNC_VERT_HIGH_ACT)
-                                          ? POS : NEG;
-       modparm.clock_phase_polarity = (var->sync & FB_SYNC_COMP_HIGH_ACT)
-                                      ? POS : NEG;
+       modparm.vertical_sync_polarity =
+               (var->sync & FB_SYNC_HOR_HIGH_ACT) ? POS : NEG;
+       modparm.horizontal_sync_polarity =
+               (var->sync & FB_SYNC_VERT_HIGH_ACT) ? POS : NEG;
+       modparm.clock_phase_polarity =
+               (var->sync & FB_SYNC_COMP_HIGH_ACT) ? POS : NEG;
        modparm.horizontal_display_end = var->xres;
        modparm.horizontal_sync_width = var->hsync_len;
        modparm.horizontal_sync_start = var->xres + var->right_margin;
@@ -314,7 +314,7 @@ int hw_sm750_crtc_setMode(struct lynxfb_crtc *crtc,
        if (crtc->channel != sm750_secondary) {
                /* set pitch, offset, width, start address, etc... */
                poke32(PANEL_FB_ADDRESS,
-                      crtc->oScreen & PANEL_FB_ADDRESS_ADDRESS_MASK);
+                      crtc->o_screen & PANEL_FB_ADDRESS_ADDRESS_MASK);
 
                reg = var->xres * (var->bits_per_pixel >> 3);
                /*
@@ -323,17 +323,17 @@ int hw_sm750_crtc_setMode(struct lynxfb_crtc *crtc,
                 */
                reg = ALIGN(reg, crtc->line_pad);
                reg = (reg << PANEL_FB_WIDTH_WIDTH_SHIFT) &
-                      PANEL_FB_WIDTH_WIDTH_MASK;
+                     PANEL_FB_WIDTH_WIDTH_MASK;
                reg |= (fix->line_length & PANEL_FB_WIDTH_OFFSET_MASK);
                poke32(PANEL_FB_WIDTH, reg);
 
                reg = ((var->xres - 1) << PANEL_WINDOW_WIDTH_WIDTH_SHIFT) &
-                      PANEL_WINDOW_WIDTH_WIDTH_MASK;
+                     PANEL_WINDOW_WIDTH_WIDTH_MASK;
                reg |= (var->xoffset & PANEL_WINDOW_WIDTH_X_MASK);
                poke32(PANEL_WINDOW_WIDTH, reg);
 
-               reg = (var->yres_virtual - 1) <<
-                     PANEL_WINDOW_HEIGHT_HEIGHT_SHIFT;
+               reg = (var->yres_virtual - 1)
+                     << PANEL_WINDOW_HEIGHT_HEIGHT_SHIFT;
                reg &= PANEL_WINDOW_HEIGHT_HEIGHT_MASK;
                reg |= (var->yoffset & PANEL_WINDOW_HEIGHT_Y_MASK);
                poke32(PANEL_WINDOW_HEIGHT, reg);
@@ -341,7 +341,7 @@ int hw_sm750_crtc_setMode(struct lynxfb_crtc *crtc,
                poke32(PANEL_PLANE_TL, 0);
 
                reg = ((var->yres - 1) << PANEL_PLANE_BR_BOTTOM_SHIFT) &
-                      PANEL_PLANE_BR_BOTTOM_MASK;
+                     PANEL_PLANE_BR_BOTTOM_MASK;
                reg |= ((var->xres - 1) & PANEL_PLANE_BR_RIGHT_MASK);
                poke32(PANEL_PLANE_BR, reg);
 
@@ -350,7 +350,7 @@ int hw_sm750_crtc_setMode(struct lynxfb_crtc *crtc,
                poke32(PANEL_DISPLAY_CTRL, reg | (var->bits_per_pixel >> 4));
        } else {
                /* not implemented now */
-               poke32(CRT_FB_ADDRESS, crtc->oScreen);
+               poke32(CRT_FB_ADDRESS, crtc->o_screen);
                reg = var->xres * (var->bits_per_pixel >> 3);
                /*
                 * crtc->channel is not equal to par->index on numeric,
@@ -372,10 +372,10 @@ exit:
        return ret;
 }
 
-int hw_sm750_setColReg(struct lynxfb_crtc *crtc, ushort index,
-                      ushort red, ushort green, ushort blue)
+int hw_sm750_setColReg(struct lynxfb_crtc *crtc, ushort index, ushort red,
+                      ushort green, ushort blue)
 {
-       static unsigned int add[] = {PANEL_PALETTE_RAM, CRT_PALETTE_RAM};
+       static unsigned int add[] = { PANEL_PALETTE_RAM, CRT_PALETTE_RAM };
 
        poke32(add[crtc->channel] + index * 4,
               (red << 16) | (green << 8) | blue);
@@ -510,7 +510,7 @@ int hw_sm750le_deWait(void)
 {
        int i = 0x10000000;
        unsigned int mask = DE_STATE2_DE_STATUS_BUSY | DE_STATE2_DE_FIFO_EMPTY |
-               DE_STATE2_DE_MEM_FIFO_EMPTY;
+                           DE_STATE2_DE_MEM_FIFO_EMPTY;
 
        while (i--) {
                unsigned int val = peek32(DE_STATE2);
@@ -527,8 +527,8 @@ int hw_sm750_deWait(void)
 {
        int i = 0x10000000;
        unsigned int mask = SYSTEM_CTRL_DE_STATUS_BUSY |
-               SYSTEM_CTRL_DE_FIFO_EMPTY |
-               SYSTEM_CTRL_DE_MEM_FIFO_EMPTY;
+                           SYSTEM_CTRL_DE_FIFO_EMPTY |
+                           SYSTEM_CTRL_DE_MEM_FIFO_EMPTY;
 
        while (i--) {
                unsigned int val = peek32(SYSTEM_CTRL);
@@ -554,15 +554,15 @@ int hw_sm750_pan_display(struct lynxfb_crtc *crtc,
 
        total = var->yoffset * info->fix.line_length +
                ((var->xoffset * var->bits_per_pixel) >> 3);
-       total += crtc->oScreen;
+       total += crtc->o_screen;
        if (crtc->channel == sm750_primary) {
                poke32(PANEL_FB_ADDRESS,
                       peek32(PANEL_FB_ADDRESS) |
-                      (total & PANEL_FB_ADDRESS_ADDRESS_MASK));
+                              (total & PANEL_FB_ADDRESS_ADDRESS_MASK));
        } else {
                poke32(CRT_FB_ADDRESS,
                       peek32(CRT_FB_ADDRESS) |
-                      (total & CRT_FB_ADDRESS_ADDRESS_MASK));
+                              (total & CRT_FB_ADDRESS_ADDRESS_MASK));
        }
        return 0;
 }