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

Commit 75ec9bb0 authored by Alan Cox's avatar Alan Cox Committed by Greg Kroah-Hartman
Browse files

gma500: psb_intel_lvds style 



Fixed some stylistic uglies noticed while fixing the previous bug

Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d3cf695c

drivers/staging/gma500/psb_intel_lvds.c

+23 −26
Original line number Diff line number Diff line
@@ -30,10 +30,7 @@ 
#include "power.h"

#include <linux/pm_runtime.h>



u32 CoreClock;

u32 PWMControlRegFreq;



/**

/*

 * LVDS I2C backlight control macros

 */

#define BRIGHTNESS_MAX_LEVEL 100
@@ -51,7 +48,7 @@ u32 PWMControlRegFreq; 
#define PSB_BACKLIGHT_PWM_POLARITY_BIT_CLEAR (0xFFFE)



struct psb_intel_lvds_priv {

	/**

	/*

	 * Saved LVDO output states

	 */

	uint32_t savePP_ON;
@@ -64,9 +61,8 @@ struct psb_intel_lvds_priv { 
	uint32_t saveBLC_PWM_CTL;

};



/* MRST defines end */



/**

/*

 * Returns the maximum level of the backlight duty cycle field.

 */

static u32 psb_intel_lvds_get_max_backlight(struct drm_device *dev)
@@ -161,7 +157,7 @@ static int psb_lvds_pwm_set_brightness(struct drm_device *dev, int level) 
	return 0;

}



/**

/*

 * Set LVDS backlight level either by I2C or PWM

 */

void psb_intel_lvds_set_brightness(struct drm_device *dev, int level)
@@ -183,10 +179,10 @@ void psb_intel_lvds_set_brightness(struct drm_device *dev, int level) 
		psb_lvds_pwm_set_brightness(dev, level);

}



/**

/*

 * Sets the backlight level.

 *

 * \param level backlight level, from 0 to psb_intel_lvds_get_max_backlight().

 * level: backlight level, from 0 to psb_intel_lvds_get_max_backlight().

 */

static void psb_intel_lvds_set_backlight(struct drm_device *dev, int level)

{
@@ -208,7 +204,7 @@ static void psb_intel_lvds_set_backlight(struct drm_device *dev, int level) 
	}

}



/**

/*

 * Sets the power state for the panel.

 */

static void psb_intel_lvds_set_power(struct drm_device *dev,
@@ -501,7 +497,7 @@ static void psb_intel_lvds_mode_set(struct drm_encoder *encoder, 
	REG_WRITE(PFIT_CONTROL, pfit_control);

}



/**

/*

 * Detect the LVDS connection.

 *

 * This always returns CONNECTOR_STATUS_CONNECTED.
@@ -514,7 +510,7 @@ static enum drm_connector_status psb_intel_lvds_detect(struct drm_connector 
	return connector_status_connected;

}



/**

/*

 * Return the list of DDC modes if available, or the BIOS fixed mode otherwise.

 */

static int psb_intel_lvds_get_modes(struct drm_connector *connector)
@@ -582,11 +578,11 @@ int psb_intel_lvds_set_property(struct drm_connector *connector, 
	dev_priv = encoder->dev->dev_private;



	if (!strcmp(property->name, "scaling mode")) {

		struct psb_intel_crtc *pPsbCrtc =

		struct psb_intel_crtc *crtc =

					to_psb_intel_crtc(encoder->crtc);

		uint64_t curValue;



		if (!pPsbCrtc)

		if (!crtc)

			goto set_prop_error;



		switch (value) {
@@ -613,10 +609,10 @@ int psb_intel_lvds_set_property(struct drm_connector *connector, 
							value))

			goto set_prop_error;



		if (pPsbCrtc->saved_mode.hdisplay != 0 &&

		    pPsbCrtc->saved_mode.vdisplay != 0) {

		if (crtc->saved_mode.hdisplay != 0 &&

		    crtc->saved_mode.vdisplay != 0) {

			if (!drm_crtc_helper_set_mode(encoder->crtc,

						      &pPsbCrtc->saved_mode,

						      &crtc->saved_mode,

						      encoder->crtc->x,

						      encoder->crtc->y,

						      encoder->crtc->fb))
@@ -629,7 +625,8 @@ int psb_intel_lvds_set_property(struct drm_connector *connector, 
			goto set_prop_error;

		else {

#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE

			struct backlight_device *bd = dev_priv->backlight_device;

			struct backlight_device *bd =

					dev_priv->backlight_device;

			if (bd) {

				bd->props.brightness = value;

				backlight_update_status(bd);
@@ -749,7 +746,7 @@ void psb_intel_lvds_init(struct drm_device *dev, 
				      dev_priv->backlight_property,

				      BRIGHTNESS_MAX_LEVEL);



	/**

	/*

	 * Set up I2C bus

	 * FIXME: distroy i2c_bus when exit

	 */