mirror of
https://github.com/torvalds/linux.git
synced 2024-12-16 16:12:52 +00:00
1e3b097012
Rickard Strandqvi's ran a code analysis application which found that jornada_lcd_get_contrast(() and jornada_lcd_set_contrast() contained some code duplication (calling the same functions during various code execution paths) and failed to return errors in a consistent manner. This patch aims to simplify the code, coercing it into behaving at a level expected of a driver in the Linux kernel. Suggested-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se> Acked-by: Jingoo Han <jg1.han@samsung.com> Reviewed-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se> Signed-off-by: Lee Jones <lee.jones@linaro.org>
136 lines
2.9 KiB
C
136 lines
2.9 KiB
C
/*
|
|
*
|
|
* LCD driver for HP Jornada 700 series (710/720/728)
|
|
* Copyright (C) 2006-2009 Kristoffer Ericson <kristoffer.ericson@gmail.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License version
|
|
* 2 or any later version as published by the Free Software Foundation.
|
|
*
|
|
*/
|
|
|
|
#include <linux/device.h>
|
|
#include <linux/fb.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/lcd.h>
|
|
#include <linux/module.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/delay.h>
|
|
|
|
#include <mach/jornada720.h>
|
|
#include <mach/hardware.h>
|
|
|
|
#include <video/s1d13xxxfb.h>
|
|
|
|
#define LCD_MAX_CONTRAST 0xff
|
|
#define LCD_DEF_CONTRAST 0x80
|
|
|
|
static int jornada_lcd_get_power(struct lcd_device *ld)
|
|
{
|
|
/* LDD2 in PPC = LCD POWER */
|
|
if (PPSR & PPC_LDD2)
|
|
return FB_BLANK_UNBLANK; /* PW ON */
|
|
else
|
|
return FB_BLANK_POWERDOWN; /* PW OFF */
|
|
}
|
|
|
|
static int jornada_lcd_get_contrast(struct lcd_device *ld)
|
|
{
|
|
int ret;
|
|
|
|
if (jornada_lcd_get_power(ld) != FB_BLANK_UNBLANK)
|
|
return 0;
|
|
|
|
jornada_ssp_start();
|
|
|
|
if (jornada_ssp_byte(GETCONTRAST) == TXDUMMY) {
|
|
ret = jornada_ssp_byte(TXDUMMY);
|
|
goto success;
|
|
}
|
|
|
|
dev_err(&ld->dev, "failed to set contrast\n");
|
|
ret = -ETIMEDOUT;
|
|
|
|
success:
|
|
jornada_ssp_end();
|
|
return ret;
|
|
}
|
|
|
|
static int jornada_lcd_set_contrast(struct lcd_device *ld, int value)
|
|
{
|
|
int ret = 0;
|
|
|
|
jornada_ssp_start();
|
|
|
|
/* start by sending our set contrast cmd to mcu */
|
|
if (jornada_ssp_byte(SETCONTRAST) == TXDUMMY) {
|
|
/* if successful push the new value */
|
|
if (jornada_ssp_byte(value) == TXDUMMY)
|
|
goto success;
|
|
}
|
|
|
|
dev_err(&ld->dev, "failed to set contrast\n");
|
|
ret = -ETIMEDOUT;
|
|
|
|
success:
|
|
jornada_ssp_end();
|
|
return ret;
|
|
}
|
|
|
|
static int jornada_lcd_set_power(struct lcd_device *ld, int power)
|
|
{
|
|
if (power != FB_BLANK_UNBLANK) {
|
|
PPSR &= ~PPC_LDD2;
|
|
PPDR |= PPC_LDD2;
|
|
} else {
|
|
PPSR |= PPC_LDD2;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static struct lcd_ops jornada_lcd_props = {
|
|
.get_contrast = jornada_lcd_get_contrast,
|
|
.set_contrast = jornada_lcd_set_contrast,
|
|
.get_power = jornada_lcd_get_power,
|
|
.set_power = jornada_lcd_set_power,
|
|
};
|
|
|
|
static int jornada_lcd_probe(struct platform_device *pdev)
|
|
{
|
|
struct lcd_device *lcd_device;
|
|
int ret;
|
|
|
|
lcd_device = devm_lcd_device_register(&pdev->dev, S1D_DEVICENAME,
|
|
&pdev->dev, NULL, &jornada_lcd_props);
|
|
|
|
if (IS_ERR(lcd_device)) {
|
|
ret = PTR_ERR(lcd_device);
|
|
dev_err(&pdev->dev, "failed to register device\n");
|
|
return ret;
|
|
}
|
|
|
|
platform_set_drvdata(pdev, lcd_device);
|
|
|
|
/* lets set our default values */
|
|
jornada_lcd_set_contrast(lcd_device, LCD_DEF_CONTRAST);
|
|
jornada_lcd_set_power(lcd_device, FB_BLANK_UNBLANK);
|
|
/* give it some time to startup */
|
|
msleep(100);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static struct platform_driver jornada_lcd_driver = {
|
|
.probe = jornada_lcd_probe,
|
|
.driver = {
|
|
.name = "jornada_lcd",
|
|
},
|
|
};
|
|
|
|
module_platform_driver(jornada_lcd_driver);
|
|
|
|
MODULE_AUTHOR("Kristoffer Ericson <kristoffer.ericson@gmail.com>");
|
|
MODULE_DESCRIPTION("HP Jornada 710/720/728 LCD driver");
|
|
MODULE_LICENSE("GPL");
|