Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f24c865 authored by Stefan Wolz's avatar Stefan Wolz Committed by Greg Kroah-Hartman
Browse files

sm750fb/sm750_hw.c: fixed whitespacing 



Deleted unnecessary newlines and added whitespaces around operators.

Signed-off-by: default avatarStefan Wolz <wolzstefan@web.de>
Signed-off-by: default avatarChristian Halder <christian.halder@fau.de>
Signed-off-by: default avatarSebastian Handwerker <sebastian.handwerker@posteo.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bfbeb71c

drivers/staging/sm750fb/sm750_hw.c

+9 −17
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ int hw_sm750_map(struct sm750_dev *sm750_dev, struct pci_dev *pdev) 
		pr_info("mmio virtual addr = %p\n", sm750_dev->pvReg);

	}





	sm750_dev->accel.dprBase = sm750_dev->pvReg + DE_BASE_ADDR_TYPE1;

	sm750_dev->accel.dpPortBase = sm750_dev->pvReg + DE_PORT_ADDR_TYPE1;
@@ -86,8 +85,6 @@ int hw_sm750_map(struct sm750_dev *sm750_dev, struct pci_dev *pdev) 
	return ret;

}







int hw_sm750_inithw(struct sm750_dev *sm750_dev, struct pci_dev *pdev)

{

	struct init_status *parm;
@@ -184,7 +181,6 @@ int hw_sm750_output_setMode(struct lynxfb_output *output, 
	dispSet = 0;

	channel = *output->channel;





	if (getChipType() != SM750LE) {

		if (channel == sm750_primary) {

			pr_info("primary channel\n");
@@ -199,7 +195,6 @@ int hw_sm750_output_setMode(struct lynxfb_output *output, 
				dispSet |= do_LCD1_SEC;

			if (output->paths & sm750_crt)

				dispSet |= do_CRT_SEC;



		}

		ddk750_setLogicalDispOut(dispSet);

	} else {
@@ -234,13 +229,11 @@ int hw_sm750_crtc_checkMode(struct lynxfb_crtc *crtc, struct fb_var_screeninfo * 
		break;

	default:

		return -EINVAL;



	}



	return 0;

}





/*

	set the controller's mode for @crtc charged with @var and @fix parameters

*/
@@ -255,7 +248,6 @@ int hw_sm750_crtc_setMode(struct lynxfb_crtc *crtc, 
	struct sm750_dev *sm750_dev;

	struct lynxfb_par *par;





	ret = 0;

	par = container_of(crtc, struct lynxfb_par, crtc);

	sm750_dev = par->dev;
@@ -279,9 +271,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;
@@ -353,10 +348,8 @@ int hw_sm750_crtc_setMode(struct lynxfb_crtc *crtc, 
		reg |= ((var->bits_per_pixel >> 4) &

			CRT_DISPLAY_CTRL_FORMAT_MASK);

		POKE32(CRT_DISPLAY_CTRL, reg);



	}





exit:

	return ret;

}
@@ -366,7 +359,8 @@ int hw_sm750_setColReg(struct lynxfb_crtc *crtc, ushort index, 
{

	static unsigned int add[] = {PANEL_PALETTE_RAM, CRT_PALETTE_RAM};



	POKE32(add[crtc->channel] + index*4, (red<<16)|(green<<8)|blue);

	POKE32(add[crtc->channel] + index * 4,

	       (red << 16) | (green << 8) | blue);

	return 0;

}
@@ -462,7 +456,6 @@ int hw_sm750_setBLANK(struct lynxfb_output *output, int blank) 
	return 0;

}





void hw_sm750_initAccel(struct sm750_dev *sm750_dev)

{

	u32 reg;
@@ -510,7 +503,6 @@ int hw_sm750le_deWait(void) 
	return -1;

}





int hw_sm750_deWait(void)

{

	int i = 0x10000000;