1 files changed, 14 insertions, 16 deletions

diff --git a/drivers/video/backlight/tosa_lcd.c b/drivers/video/backlight/tosa_lcd.c
index 33047a66cc24..96bae941585a 100644
--- a/drivers/video/backlight/tosa_lcd.c
+++ b/drivers/video/backlight/tosa_lcd.c
@@ -63,7 +63,7 @@ static int tosa_tg_send(struct spi_device *spi, int adrs, uint8_t data)
 int tosa_bl_enable(struct spi_device *spi, int enable)
 {
         /* bl_enable GP04=1 otherwise GP04=0*/
-        return tosa_tg_send(spi, TG_GPODR2, enable? 0x01 : 0x00);
+        return tosa_tg_send(spi, TG_GPODR2, enable ? 0x01 : 0x00);
 }
 EXPORT_SYMBOL(tosa_bl_enable);
 
@@ -91,15 +91,17 @@ static void tosa_lcd_tg_on(struct tosa_lcd_data *data)
         tosa_tg_send(spi, TG_PNLCTL, value);
 
         /* TG LCD pannel power up */
-        tosa_tg_send(spi, TG_PINICTL,0x4);
+        tosa_tg_send(spi, TG_PINICTL, 0x4);
         mdelay(50);
 
         /* TG LCD GVSS */
-        tosa_tg_send(spi, TG_PINICTL,0x0);
+        tosa_tg_send(spi, TG_PINICTL, 0x0);
 
         if (!data->i2c) {
-                /* after the pannel is powered up the first time, we can access the i2c bus */
-                /* so probe for the DAC */
+                /*
+                 * after the pannel is powered up the first time,
+                 * we can access the i2c bus so probe for the DAC
+                 */
                 struct i2c_adapter *adap = i2c_get_adapter(0);
                 struct i2c_board_info info = {
                         .type   = "tosa-bl",
@@ -115,11 +117,11 @@ static void tosa_lcd_tg_off(struct tosa_lcd_data *data)
         struct spi_device *spi = data->spi;
 
         /* TG LCD VHSA off */
-        tosa_tg_send(spi, TG_PINICTL,0x4);
+        tosa_tg_send(spi, TG_PINICTL, 0x4);
         mdelay(50);
 
         /* TG LCD signal off */
-        tosa_tg_send(spi, TG_PINICTL,0x6);
+        tosa_tg_send(spi, TG_PINICTL, 0x6);
         mdelay(50);
 
         /* TG Off */
@@ -169,7 +171,7 @@ static struct lcd_ops tosa_lcd_ops = {
         .set_mode = tosa_lcd_set_mode,
 };
 
-static int __devinit tosa_lcd_probe(struct spi_device *spi)
+static int tosa_lcd_probe(struct spi_device *spi)
 {
         int ret;
         struct tosa_lcd_data *data;
@@ -193,17 +195,13 @@ static int __devinit tosa_lcd_probe(struct spi_device *spi)
         data->spi = spi;
         dev_set_drvdata(&spi->dev, data);
 
-        ret = devm_gpio_request(&spi->dev, TOSA_GPIO_TG_ON, "tg #pwr");
+        ret = devm_gpio_request_one(&spi->dev, TOSA_GPIO_TG_ON,
+                                GPIOF_OUT_INIT_LOW, "tg #pwr");
         if (ret < 0)
                 goto err_gpio_tg;
 
         mdelay(60);
 
-        ret = gpio_direction_output(TOSA_GPIO_TG_ON, 0);
-        if (ret < 0)
-                goto err_gpio_tg;
-
-        mdelay(60);
         tosa_lcd_tg_init(data);
 
         tosa_lcd_tg_on(data);
@@ -226,7 +224,7 @@ err_gpio_tg:
         return ret;
 }
 
-static int __devexit tosa_lcd_remove(struct spi_device *spi)
+static int tosa_lcd_remove(struct spi_device *spi)
 {
         struct tosa_lcd_data *data = dev_get_drvdata(&spi->dev);
 
@@ -275,7 +273,7 @@ static struct spi_driver tosa_lcd_driver = {
                 .owner          = THIS_MODULE,
         },
         .probe          = tosa_lcd_probe,
-        .remove         = __devexit_p(tosa_lcd_remove),
+        .remove         = tosa_lcd_remove,
         .suspend        = tosa_lcd_suspend,
         .resume         = tosa_lcd_resume,
 };