staging: xgifb: XGI_main_26.c Align match parenthesis (1a252b13) · Commits · 戴 / test

drivers/staging/xgifb/XGI_main_26.c

+46 −54

Original line number	Diff line number	Diff line
		@@ -77,10 +77,10 @@ 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)
		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;
		@@ -944,9 +944,7 @@ 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,
		var->xres, var->yres, var->bits_per_pixel,
		xgifb_info->refresh_rate);

		old_mode = xgifb_info->mode_idx;
		@@ -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;
		@@ -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;
		}
		@@ -1930,10 +1925,8 @@ static int xgifb_probe(struct pci_dev *pdev,
		}

		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,13 +1943,12 @@ 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,
		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,
		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,

Admin message