staging: xgifb: XGI_main_26.c Align match parenthesis

Make suggested checkpatch modification for
CHECK: Alignment should match open parenthesis

Signed-off-by: Walt Feasel <waltfeasel@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c
index e31d107..777cd6e 100644 (file)
--- a/drivers/staging/xgifb/XGI_main_26.c
+++ b/drivers/staging/xgifb/XGI_main_26.c
@@ -56,8 +56,8 @@ static inline void dumpVGAReg(struct xgifb_video_info *xgifb_info)
 /* --------------- Hardware Access Routines -------------------------- */
 
 static int XGIfb_mode_rate_to_dclock(struct vb_device_info *XGI_Pr,
-               struct xgi_hw_device_info *HwDeviceExtension,
-               unsigned char modeno)
+                                    struct xgi_hw_device_info *HwDeviceExtension,
+                                    unsigned char modeno)
 {
        unsigned short ModeNo = modeno;
        unsigned short ModeIdIndex = 0, ClockIndex = 0;
@@ -68,7 +68,7 @@ static int XGIfb_mode_rate_to_dclock(struct vb_device_info *XGI_Pr,
        XGI_SearchModeID(ModeNo, &ModeIdIndex);
 
        RefreshRateTableIndex = XGI_GetRatePtrCRT2(HwDeviceExtension, ModeNo,
-                       ModeIdIndex, XGI_Pr);
+                                                  ModeIdIndex, XGI_Pr);
 
        ClockIndex = XGI330_RefIndex[RefreshRateTableIndex].Ext_CRTVCLK;
 
@@ -76,11 +76,11 @@ static int XGIfb_mode_rate_to_dclock(struct vb_device_info *XGI_Pr,
 }
 
 static int XGIfb_mode_rate_to_ddata(struct vb_device_info *XGI_Pr,
-               struct xgi_hw_device_info *HwDeviceExtension,
-               unsigned char modeno,
-               u32 *left_margin, u32 *right_margin, u32 *upper_margin,
-               u32 *lower_margin, u32 *hsync_len, u32 *vsync_len, u32 *sync,
-               u32 *vmode)
+                                   struct xgi_hw_device_info *HwDeviceExtension,
+                                   unsigned char modeno, u32 *left_margin,
+                                   u32 *right_margin, u32 *upper_margin,
+                                   u32 *lower_margin, u32 *hsync_len,
+                                   u32 *vsync_len, u32 *sync, u32 *vmode)
 {
        unsigned short ModeNo = modeno;
        unsigned short ModeIdIndex, index = 0;
@@ -95,7 +95,7 @@ static int XGIfb_mode_rate_to_ddata(struct vb_device_info *XGI_Pr,
        if (!XGI_SearchModeID(ModeNo, &ModeIdIndex))
                return 0;
        RefreshRateTableIndex = XGI_GetRatePtrCRT2(HwDeviceExtension, ModeNo,
-                       ModeIdIndex, XGI_Pr);
+                                                  ModeIdIndex, XGI_Pr);
        index = XGI330_RefIndex[RefreshRateTableIndex].Ext_CRT1CRTC;
 
        sr_data = XGI_CRT1Table[index].CR[5];
@@ -682,7 +682,7 @@ static void XGIfb_pre_setmode(struct xgifb_video_info *xgifb_info)
        xgifb_reg_set(XGICR, IND_XGI_SCRATCH_REG_CR30, cr30);
        xgifb_reg_set(XGICR, IND_XGI_SCRATCH_REG_CR31, cr31);
        xgifb_reg_set(XGICR, IND_XGI_SCRATCH_REG_CR33,
-                                               (xgifb_info->rate_idx & 0x0F));
+                     (xgifb_info->rate_idx & 0x0F));
 }
 
 static void XGIfb_post_setmode(struct xgifb_video_info *xgifb_info)
@@ -904,7 +904,7 @@ static void XGIfb_post_setmode(struct xgifb_video_info *xgifb_info)
 }
 
 static int XGIfb_do_set_var(struct fb_var_screeninfo *var, int isactive,
-               struct fb_info *info)
+                           struct fb_info *info)
 {
        struct xgifb_video_info *xgifb_info = info->par;
        struct xgi_hw_device_info *hw_info = &xgifb_info->hw_info;
@@ -944,10 +944,8 @@ static int XGIfb_do_set_var(struct fb_var_screeninfo *var, int isactive,
        }
 
        pr_debug("Change mode to %dx%dx%d-%dHz\n",
-              var->xres,
-              var->yres,
-              var->bits_per_pixel,
-              xgifb_info->refresh_rate);
+                var->xres, var->yres, var->bits_per_pixel,
+                xgifb_info->refresh_rate);
 
        old_mode = xgifb_info->mode_idx;
        xgifb_info->mode_idx = 0;
@@ -1159,7 +1157,7 @@ static int XGIfb_setcolreg(unsigned int regno, unsigned int red,
 /* ----------- FBDev related routines for all series ---------- */
 
 static int XGIfb_get_fix(struct fb_fix_screeninfo *fix, int con,
-               struct fb_info *info)
+                        struct fb_info *info)
 {
        struct xgifb_video_info *xgifb_info = info->par;
 
@@ -1253,10 +1251,10 @@ static int XGIfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
 
        search_idx = 0;
        while ((XGIbios_mode[search_idx].mode_no != 0) &&
-               (XGIbios_mode[search_idx].xres <= var->xres)) {
+              (XGIbios_mode[search_idx].xres <= var->xres)) {
                if ((XGIbios_mode[search_idx].xres == var->xres) &&
-                       (XGIbios_mode[search_idx].yres == var->yres) &&
-                       (XGIbios_mode[search_idx].bpp == var->bits_per_pixel)) {
+                   (XGIbios_mode[search_idx].yres == var->yres) &&
+                   (XGIbios_mode[search_idx].bpp == var->bits_per_pixel)) {
                        if (XGIfb_validate_mode(xgifb_info, search_idx) > 0) {
                                found_mode = 1;
                                break;
@@ -1267,7 +1265,7 @@ static int XGIfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
 
        if (!found_mode) {
                pr_err("%dx%dx%d is no valid mode\n",
-                       var->xres, var->yres, var->bits_per_pixel);
+                      var->xres, var->yres, var->bits_per_pixel);
                search_idx = 0;
                while (XGIbios_mode[search_idx].mode_no != 0) {
                        if ((var->xres <= XGIbios_mode[search_idx].xres) &&
@@ -1286,11 +1284,11 @@ static int XGIfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
                        var->xres = XGIbios_mode[search_idx].xres;
                        var->yres = XGIbios_mode[search_idx].yres;
                        pr_debug("Adapted to mode %dx%dx%d\n",
-                               var->xres, var->yres, var->bits_per_pixel);
+                                var->xres, var->yres, var->bits_per_pixel);
 
                } else {
                        pr_err("Failed to find similar mode to %dx%dx%d\n",
-                               var->xres, var->yres, var->bits_per_pixel);
+                              var->xres, var->yres, var->bits_per_pixel);
                        return -EINVAL;
                }
        }
@@ -1322,7 +1320,7 @@ static int XGIfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
 }
 
 static int XGIfb_pan_display(struct fb_var_screeninfo *var,
-               struct fb_info *info)
+                            struct fb_info *info)
 {
        int err;
 
@@ -1462,8 +1460,7 @@ static int XGIfb_get_dram_size(struct xgifb_video_info *xgifb_info)
        xgifb_info->video_size = xgifb_info->video_size * ChannelNum;
 
        pr_info("SR14=%x DramSzie %x ChannelNum %x\n",
-              reg,
-              xgifb_info->video_size, ChannelNum);
+               reg, xgifb_info->video_size, ChannelNum);
        return 0;
 }
 
@@ -1620,8 +1617,7 @@ static int __init XGIfb_setup(char *options)
        return 0;
 }
 
-static int xgifb_probe(struct pci_dev *pdev,
-               const struct pci_device_id *ent)
+static int xgifb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
        u8 reg, reg1;
        u8 CR48, CR38;
@@ -1726,7 +1722,7 @@ static int xgifb_probe(struct pci_dev *pdev,
                                xgifb_info->video_size,
                                "XGIfb FB")) {
                dev_err(&pdev->dev, "Unable request memory size %x\n",
-                      xgifb_info->video_size);
+                       xgifb_info->video_size);
                dev_err(&pdev->dev,
                        "Fatal error: Unable to reserve frame buffer memory. Is there another framebuffer driver active?\n");
                ret = -ENODEV;
@@ -1889,8 +1885,7 @@ static int xgifb_probe(struct pci_dev *pdev,
        xgifb_info->refresh_rate = refresh_rate;
        if (xgifb_info->refresh_rate == 0)
                xgifb_info->refresh_rate = 60;
-       if (XGIfb_search_refresh_rate(xgifb_info,
-                       xgifb_info->refresh_rate) == 0) {
+       if (XGIfb_search_refresh_rate(xgifb_info, xgifb_info->refresh_rate) == 0) {
                xgifb_info->rate_idx = 1;
                xgifb_info->refresh_rate = 60;
        }
@@ -1925,15 +1920,13 @@ static int xgifb_probe(struct pci_dev *pdev,
        default:
                xgifb_info->video_cmap_len = 16;
                pr_info("Unsupported depth %d\n",
-                      xgifb_info->video_bpp);
+                       xgifb_info->video_bpp);
                break;
        }
 
        pr_info("Default mode is %dx%dx%d (%dHz)\n",
-              xgifb_info->video_width,
-              xgifb_info->video_height,
-              xgifb_info->video_bpp,
-              xgifb_info->refresh_rate);
+               xgifb_info->video_width, xgifb_info->video_height,
+               xgifb_info->video_bpp, xgifb_info->refresh_rate);
 
        fb_info->var.red.length         = 8;
        fb_info->var.green.length       = 8;
@@ -1950,21 +1943,20 @@ static int xgifb_probe(struct pci_dev *pdev,
 
        XGIfb_bpp_to_var(xgifb_info, &fb_info->var);
 
-       fb_info->var.pixclock = (u32)(1000000000 /
-                       XGIfb_mode_rate_to_dclock(&xgifb_info->dev_info,
-                               hw_info,
-                               XGIbios_mode[xgifb_info->mode_idx].mode_no));
-
-       if (XGIfb_mode_rate_to_ddata(&xgifb_info->dev_info, hw_info,
-               XGIbios_mode[xgifb_info->mode_idx].mode_no,
-               &fb_info->var.left_margin,
-               &fb_info->var.right_margin,
-               &fb_info->var.upper_margin,
-               &fb_info->var.lower_margin,
-               &fb_info->var.hsync_len,
-               &fb_info->var.vsync_len,
-               &fb_info->var.sync,
-               &fb_info->var.vmode)) {
+       fb_info->var.pixclock = (u32)(1000000000 / XGIfb_mode_rate_to_dclock
+                                     (&xgifb_info->dev_info, hw_info,
+                                      XGIbios_mode[xgifb_info->mode_idx].mode_no));
+
+       if (XGIfb_mode_rate_to_ddata(&xgifb_info->dev_info,
+                                    hw_info, XGIbios_mode[xgifb_info->mode_idx].mode_no,
+                                    &fb_info->var.left_margin,
+                                    &fb_info->var.right_margin,
+                                    &fb_info->var.upper_margin,
+                                    &fb_info->var.lower_margin,
+                                    &fb_info->var.hsync_len,
+                                    &fb_info->var.vsync_len,
+                                    &fb_info->var.sync,
+                                    &fb_info->var.vmode)) {
                if ((fb_info->var.vmode & FB_VMODE_MASK) ==
                    FB_VMODE_INTERLACED) {
                        fb_info->var.yres <<= 1;
@@ -2040,19 +2032,19 @@ static struct pci_driver xgifb_driver = {
 
 module_param(mode, charp, 0000);
 MODULE_PARM_DESC(mode,
-       "Selects the desired default display mode in the format XxYxDepth (eg. 1024x768x16).");
+                "Selects the desired default display mode in the format XxYxDepth (eg. 1024x768x16).");
 
 module_param(forcecrt2type, charp, 0000);
 MODULE_PARM_DESC(forcecrt2type,
-       "Force the second display output type. Possible values are NONE, LCD, TV, VGA, SVIDEO or COMPOSITE.");
+                "Force the second display output type. Possible values are NONE, LCD, TV, VGA, SVIDEO or COMPOSITE.");
 
 module_param(vesa, int, 0000);
 MODULE_PARM_DESC(vesa,
-       "Selects the desired default display mode by VESA mode number (eg. 0x117).");
+                "Selects the desired default display mode by VESA mode number (eg. 0x117).");
 
 module_param(filter, int, 0000);
 MODULE_PARM_DESC(filter,
-       "Selects TV flicker filter type (only for systems with a SiS301 video bridge). Possible values 0-7. Default: [no filter]).");
+                "Selects TV flicker filter type (only for systems with a SiS301 video bridge). Possible values 0-7. Default: [no filter]).");
 
 static int __init xgifb_init(void)
 {