backlight: use dev_get_platdata()

Use the wrapper function for retrieving the platform data instead of
accessing dev->platform_data directly.  This is a cosmetic change to
make the code simpler and enhance the readability.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jingoo Han 2013-11-12 15:09:04 -08:00 committed by Linus Torvalds
parent 1f299997b4
commit c512794cad
32 changed files with 44 additions and 46 deletions

View File

@ -196,7 +196,7 @@ static int pm860x_backlight_dt_init(struct platform_device *pdev,
static int pm860x_backlight_probe(struct platform_device *pdev) static int pm860x_backlight_probe(struct platform_device *pdev)
{ {
struct pm860x_chip *chip = dev_get_drvdata(pdev->dev.parent); struct pm860x_chip *chip = dev_get_drvdata(pdev->dev.parent);
struct pm860x_backlight_pdata *pdata = pdev->dev.platform_data; struct pm860x_backlight_pdata *pdata = dev_get_platdata(&pdev->dev);
struct pm860x_backlight_data *data; struct pm860x_backlight_data *data;
struct backlight_device *bl; struct backlight_device *bl;
struct resource *res; struct resource *res;

View File

@ -127,7 +127,7 @@ static const struct backlight_ops aat2870_bl_ops = {
static int aat2870_bl_probe(struct platform_device *pdev) static int aat2870_bl_probe(struct platform_device *pdev)
{ {
struct aat2870_bl_platform_data *pdata = pdev->dev.platform_data; struct aat2870_bl_platform_data *pdata = dev_get_platdata(&pdev->dev);
struct aat2870_bl_driver_data *aat2870_bl; struct aat2870_bl_driver_data *aat2870_bl;
struct backlight_device *bd; struct backlight_device *bd;
struct backlight_properties props; struct backlight_properties props;

View File

@ -297,7 +297,7 @@ static int adp5520_bl_probe(struct platform_device *pdev)
return -ENOMEM; return -ENOMEM;
data->master = pdev->dev.parent; data->master = pdev->dev.parent;
data->pdata = pdev->dev.platform_data; data->pdata = dev_get_platdata(&pdev->dev);
if (data->pdata == NULL) { if (data->pdata == NULL) {
dev_err(&pdev->dev, "missing platform data\n"); dev_err(&pdev->dev, "missing platform data\n");

View File

@ -216,7 +216,7 @@ static int adp8860_led_setup(struct adp8860_led *led)
static int adp8860_led_probe(struct i2c_client *client) static int adp8860_led_probe(struct i2c_client *client)
{ {
struct adp8860_backlight_platform_data *pdata = struct adp8860_backlight_platform_data *pdata =
client->dev.platform_data; dev_get_platdata(&client->dev);
struct adp8860_bl *data = i2c_get_clientdata(client); struct adp8860_bl *data = i2c_get_clientdata(client);
struct adp8860_led *led, *led_dat; struct adp8860_led *led, *led_dat;
struct led_info *cur_led; struct led_info *cur_led;
@ -300,7 +300,7 @@ static int adp8860_led_probe(struct i2c_client *client)
static int adp8860_led_remove(struct i2c_client *client) static int adp8860_led_remove(struct i2c_client *client)
{ {
struct adp8860_backlight_platform_data *pdata = struct adp8860_backlight_platform_data *pdata =
client->dev.platform_data; dev_get_platdata(&client->dev);
struct adp8860_bl *data = i2c_get_clientdata(client); struct adp8860_bl *data = i2c_get_clientdata(client);
int i; int i;
@ -658,7 +658,7 @@ static int adp8860_probe(struct i2c_client *client,
struct backlight_device *bl; struct backlight_device *bl;
struct adp8860_bl *data; struct adp8860_bl *data;
struct adp8860_backlight_platform_data *pdata = struct adp8860_backlight_platform_data *pdata =
client->dev.platform_data; dev_get_platdata(&client->dev);
struct backlight_properties props; struct backlight_properties props;
uint8_t reg_val; uint8_t reg_val;
int ret; int ret;

View File

@ -238,7 +238,7 @@ static int adp8870_led_setup(struct adp8870_led *led)
static int adp8870_led_probe(struct i2c_client *client) static int adp8870_led_probe(struct i2c_client *client)
{ {
struct adp8870_backlight_platform_data *pdata = struct adp8870_backlight_platform_data *pdata =
client->dev.platform_data; dev_get_platdata(&client->dev);
struct adp8870_bl *data = i2c_get_clientdata(client); struct adp8870_bl *data = i2c_get_clientdata(client);
struct adp8870_led *led, *led_dat; struct adp8870_led *led, *led_dat;
struct led_info *cur_led; struct led_info *cur_led;
@ -325,7 +325,7 @@ static int adp8870_led_probe(struct i2c_client *client)
static int adp8870_led_remove(struct i2c_client *client) static int adp8870_led_remove(struct i2c_client *client)
{ {
struct adp8870_backlight_platform_data *pdata = struct adp8870_backlight_platform_data *pdata =
client->dev.platform_data; dev_get_platdata(&client->dev);
struct adp8870_bl *data = i2c_get_clientdata(client); struct adp8870_bl *data = i2c_get_clientdata(client);
int i; int i;
@ -848,7 +848,7 @@ static int adp8870_probe(struct i2c_client *client,
struct backlight_device *bl; struct backlight_device *bl;
struct adp8870_bl *data; struct adp8870_bl *data;
struct adp8870_backlight_platform_data *pdata = struct adp8870_backlight_platform_data *pdata =
client->dev.platform_data; dev_get_platdata(&client->dev);
uint8_t reg_val; uint8_t reg_val;
int ret; int ret;

View File

@ -471,7 +471,7 @@ static int ams369fg06_probe(struct spi_device *spi)
lcd->spi = spi; lcd->spi = spi;
lcd->dev = &spi->dev; lcd->dev = &spi->dev;
lcd->lcd_pd = spi->dev.platform_data; lcd->lcd_pd = dev_get_platdata(&spi->dev);
if (!lcd->lcd_pd) { if (!lcd->lcd_pd) {
dev_err(&spi->dev, "platform data is NULL\n"); dev_err(&spi->dev, "platform data is NULL\n");
return -EINVAL; return -EINVAL;

View File

@ -133,7 +133,7 @@ static int atmel_pwm_bl_probe(struct platform_device *pdev)
pwmbl->pdev = pdev; pwmbl->pdev = pdev;
pdata = pdev->dev.platform_data; pdata = dev_get_platdata(&pdev->dev);
if (!pdata) { if (!pdata) {
retval = -ENODEV; retval = -ENODEV;
goto err_free_mem; goto err_free_mem;

View File

@ -128,7 +128,7 @@ static const struct backlight_ops bd6107_backlight_ops = {
static int bd6107_probe(struct i2c_client *client, static int bd6107_probe(struct i2c_client *client,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct bd6107_platform_data *pdata = client->dev.platform_data; struct bd6107_platform_data *pdata = dev_get_platdata(&client->dev);
struct backlight_device *backlight; struct backlight_device *backlight;
struct backlight_properties props; struct backlight_properties props;
struct bd6107 *bd; struct bd6107 *bd;

View File

@ -533,7 +533,7 @@ static int setup_gpio_backlight(struct corgi_lcd *lcd,
static int corgi_lcd_probe(struct spi_device *spi) static int corgi_lcd_probe(struct spi_device *spi)
{ {
struct backlight_properties props; struct backlight_properties props;
struct corgi_lcd_platform_data *pdata = spi->dev.platform_data; struct corgi_lcd_platform_data *pdata = dev_get_platdata(&spi->dev);
struct corgi_lcd *lcd; struct corgi_lcd *lcd;
int ret = 0; int ret = 0;

View File

@ -109,7 +109,7 @@ static const struct backlight_ops da903x_backlight_ops = {
static int da903x_backlight_probe(struct platform_device *pdev) static int da903x_backlight_probe(struct platform_device *pdev)
{ {
struct da9034_backlight_pdata *pdata = pdev->dev.platform_data; struct da9034_backlight_pdata *pdata = dev_get_platdata(&pdev->dev);
struct da903x_backlight_data *data; struct da903x_backlight_data *data;
struct backlight_device *bl; struct backlight_device *bl;
struct backlight_properties props; struct backlight_properties props;

View File

@ -79,7 +79,7 @@ static const struct backlight_ops genericbl_ops = {
static int genericbl_probe(struct platform_device *pdev) static int genericbl_probe(struct platform_device *pdev)
{ {
struct backlight_properties props; struct backlight_properties props;
struct generic_bl_info *machinfo = pdev->dev.platform_data; struct generic_bl_info *machinfo = dev_get_platdata(&pdev->dev);
const char *name = "generic-bl"; const char *name = "generic-bl";
struct backlight_device *bd; struct backlight_device *bd;

View File

@ -62,7 +62,8 @@ static const struct backlight_ops gpio_backlight_ops = {
static int gpio_backlight_probe(struct platform_device *pdev) static int gpio_backlight_probe(struct platform_device *pdev)
{ {
struct gpio_backlight_platform_data *pdata = pdev->dev.platform_data; struct gpio_backlight_platform_data *pdata =
dev_get_platdata(&pdev->dev);
struct backlight_properties props; struct backlight_properties props;
struct backlight_device *bl; struct backlight_device *bl;
struct gpio_backlight *gbl; struct gpio_backlight *gbl;

View File

@ -198,7 +198,7 @@ static void ili9320_setup_spi(struct ili9320 *ili,
int ili9320_probe_spi(struct spi_device *spi, int ili9320_probe_spi(struct spi_device *spi,
struct ili9320_client *client) struct ili9320_client *client)
{ {
struct ili9320_platdata *cfg = spi->dev.platform_data; struct ili9320_platdata *cfg = dev_get_platdata(&spi->dev);
struct device *dev = &spi->dev; struct device *dev = &spi->dev;
struct ili9320 *ili; struct ili9320 *ili;
struct lcd_device *lcd; struct lcd_device *lcd;

View File

@ -141,7 +141,7 @@ static const struct backlight_ops kb3886bl_ops = {
static int kb3886bl_probe(struct platform_device *pdev) static int kb3886bl_probe(struct platform_device *pdev)
{ {
struct backlight_properties props; struct backlight_properties props;
struct kb3886bl_machinfo *machinfo = pdev->dev.platform_data; struct kb3886bl_machinfo *machinfo = dev_get_platdata(&pdev->dev);
bl_machinfo = machinfo; bl_machinfo = machinfo;
if (!machinfo->limit_mask) if (!machinfo->limit_mask)

View File

@ -48,7 +48,7 @@ static void l4f00242t03_reset(unsigned int gpio)
static void l4f00242t03_lcd_init(struct spi_device *spi) static void l4f00242t03_lcd_init(struct spi_device *spi)
{ {
struct l4f00242t03_pdata *pdata = spi->dev.platform_data; struct l4f00242t03_pdata *pdata = dev_get_platdata(&spi->dev);
struct l4f00242t03_priv *priv = spi_get_drvdata(spi); struct l4f00242t03_priv *priv = spi_get_drvdata(spi);
const u16 cmd[] = { 0x36, param(0), 0x3A, param(0x60) }; const u16 cmd[] = { 0x36, param(0), 0x3A, param(0x60) };
int ret; int ret;
@ -88,7 +88,7 @@ static void l4f00242t03_lcd_init(struct spi_device *spi)
static void l4f00242t03_lcd_powerdown(struct spi_device *spi) static void l4f00242t03_lcd_powerdown(struct spi_device *spi)
{ {
struct l4f00242t03_pdata *pdata = spi->dev.platform_data; struct l4f00242t03_pdata *pdata = dev_get_platdata(&spi->dev);
struct l4f00242t03_priv *priv = spi_get_drvdata(spi); struct l4f00242t03_priv *priv = spi_get_drvdata(spi);
dev_dbg(&spi->dev, "Powering down LCD\n"); dev_dbg(&spi->dev, "Powering down LCD\n");
@ -171,7 +171,7 @@ static struct lcd_ops l4f_ops = {
static int l4f00242t03_probe(struct spi_device *spi) static int l4f00242t03_probe(struct spi_device *spi)
{ {
struct l4f00242t03_priv *priv; struct l4f00242t03_priv *priv;
struct l4f00242t03_pdata *pdata = spi->dev.platform_data; struct l4f00242t03_pdata *pdata = dev_get_platdata(&spi->dev);
int ret; int ret;
if (pdata == NULL) { if (pdata == NULL) {

View File

@ -702,7 +702,7 @@ static int ld9040_probe(struct spi_device *spi)
lcd->spi = spi; lcd->spi = spi;
lcd->dev = &spi->dev; lcd->dev = &spi->dev;
lcd->lcd_pd = spi->dev.platform_data; lcd->lcd_pd = dev_get_platdata(&spi->dev);
if (!lcd->lcd_pd) { if (!lcd->lcd_pd) {
dev_err(&spi->dev, "platform data is NULL.\n"); dev_err(&spi->dev, "platform data is NULL.\n");
return -EINVAL; return -EINVAL;

View File

@ -284,7 +284,7 @@ static int lm3533_bl_probe(struct platform_device *pdev)
if (!lm3533) if (!lm3533)
return -EINVAL; return -EINVAL;
pdata = pdev->dev.platform_data; pdata = dev_get_platdata(&pdev->dev);
if (!pdata) { if (!pdata) {
dev_err(&pdev->dev, "no platform data\n"); dev_err(&pdev->dev, "no platform data\n");
return -EINVAL; return -EINVAL;

View File

@ -365,7 +365,7 @@ static const struct regmap_config lm3630a_regmap = {
static int lm3630a_probe(struct i2c_client *client, static int lm3630a_probe(struct i2c_client *client,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct lm3630a_platform_data *pdata = client->dev.platform_data; struct lm3630a_platform_data *pdata = dev_get_platdata(&client->dev);
struct lm3630a_chip *pchip; struct lm3630a_chip *pchip;
int rval; int rval;

View File

@ -307,7 +307,7 @@ static int lm3639_probe(struct i2c_client *client,
{ {
int ret; int ret;
struct lm3639_chip_data *pchip; struct lm3639_chip_data *pchip;
struct lm3639_platform_data *pdata = client->dev.platform_data; struct lm3639_platform_data *pdata = dev_get_platdata(&client->dev);
struct backlight_properties props; struct backlight_properties props;
if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) { if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {

View File

@ -128,7 +128,7 @@ static int lms283gf05_power_set(struct lcd_device *ld, int power)
{ {
struct lms283gf05_state *st = lcd_get_data(ld); struct lms283gf05_state *st = lcd_get_data(ld);
struct spi_device *spi = st->spi; struct spi_device *spi = st->spi;
struct lms283gf05_pdata *pdata = spi->dev.platform_data; struct lms283gf05_pdata *pdata = dev_get_platdata(&spi->dev);
if (power <= FB_BLANK_NORMAL) { if (power <= FB_BLANK_NORMAL) {
if (pdata) if (pdata)
@ -153,7 +153,7 @@ static struct lcd_ops lms_ops = {
static int lms283gf05_probe(struct spi_device *spi) static int lms283gf05_probe(struct spi_device *spi)
{ {
struct lms283gf05_state *st; struct lms283gf05_state *st;
struct lms283gf05_pdata *pdata = spi->dev.platform_data; struct lms283gf05_pdata *pdata = dev_get_platdata(&spi->dev);
struct lcd_device *ld; struct lcd_device *ld;
int ret = 0; int ret = 0;

View File

@ -344,7 +344,7 @@ static int lms501kf03_probe(struct spi_device *spi)
lcd->spi = spi; lcd->spi = spi;
lcd->dev = &spi->dev; lcd->dev = &spi->dev;
lcd->lcd_pd = spi->dev.platform_data; lcd->lcd_pd = dev_get_platdata(&spi->dev);
if (!lcd->lcd_pd) { if (!lcd->lcd_pd) {
dev_err(&spi->dev, "platform data is NULL\n"); dev_err(&spi->dev, "platform data is NULL\n");
return -EINVAL; return -EINVAL;

View File

@ -405,7 +405,7 @@ static int lp855x_parse_dt(struct device *dev, struct device_node *node)
static int lp855x_probe(struct i2c_client *cl, const struct i2c_device_id *id) static int lp855x_probe(struct i2c_client *cl, const struct i2c_device_id *id)
{ {
struct lp855x *lp; struct lp855x *lp;
struct lp855x_platform_data *pdata = cl->dev.platform_data; struct lp855x_platform_data *pdata = dev_get_platdata(&cl->dev);
struct device_node *node = cl->dev.of_node; struct device_node *node = cl->dev.of_node;
int ret; int ret;
@ -414,7 +414,7 @@ static int lp855x_probe(struct i2c_client *cl, const struct i2c_device_id *id)
if (ret < 0) if (ret < 0)
return ret; return ret;
pdata = cl->dev.platform_data; pdata = dev_get_platdata(&cl->dev);
} }
if (!i2c_check_functionality(cl->adapter, I2C_FUNC_SMBUS_I2C_BLOCK)) if (!i2c_check_functionality(cl->adapter, I2C_FUNC_SMBUS_I2C_BLOCK))

View File

@ -93,7 +93,7 @@ static const struct backlight_ops lv5207lp_backlight_ops = {
static int lv5207lp_probe(struct i2c_client *client, static int lv5207lp_probe(struct i2c_client *client,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct lv5207lp_platform_data *pdata = client->dev.platform_data; struct lv5207lp_platform_data *pdata = dev_get_platdata(&client->dev);
struct backlight_device *backlight; struct backlight_device *backlight;
struct backlight_properties props; struct backlight_properties props;
struct lv5207lp *lv; struct lv5207lp *lv;

View File

@ -133,7 +133,7 @@ static int omapbl_probe(struct platform_device *pdev)
struct backlight_properties props; struct backlight_properties props;
struct backlight_device *dev; struct backlight_device *dev;
struct omap_backlight *bl; struct omap_backlight *bl;
struct omap_backlight_config *pdata = pdev->dev.platform_data; struct omap_backlight_config *pdata = dev_get_platdata(&pdev->dev);
if (!pdata) if (!pdata)
return -ENXIO; return -ENXIO;

View File

@ -103,7 +103,7 @@ static int pcf50633_bl_probe(struct platform_device *pdev)
{ {
struct pcf50633_bl *pcf_bl; struct pcf50633_bl *pcf_bl;
struct device *parent = pdev->dev.parent; struct device *parent = pdev->dev.parent;
struct pcf50633_platform_data *pcf50633_data = parent->platform_data; struct pcf50633_platform_data *pcf50633_data = dev_get_platdata(parent);
struct pcf50633_bl_platform_data *pdata = pcf50633_data->backlight_data; struct pcf50633_bl_platform_data *pdata = pcf50633_data->backlight_data;
struct backlight_properties bl_props; struct backlight_properties bl_props;

View File

@ -80,7 +80,7 @@ static int platform_lcd_probe(struct platform_device *pdev)
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
int err; int err;
pdata = pdev->dev.platform_data; pdata = dev_get_platdata(&pdev->dev);
if (!pdata) { if (!pdata) {
dev_err(dev, "no platform data supplied\n"); dev_err(dev, "no platform data supplied\n");
return -EINVAL; return -EINVAL;

View File

@ -163,7 +163,7 @@ static int pwm_backlight_parse_dt(struct device *dev,
static int pwm_backlight_probe(struct platform_device *pdev) static int pwm_backlight_probe(struct platform_device *pdev)
{ {
struct platform_pwm_backlight_data *data = pdev->dev.platform_data; struct platform_pwm_backlight_data *data = dev_get_platdata(&pdev->dev);
struct platform_pwm_backlight_data defdata; struct platform_pwm_backlight_data defdata;
struct backlight_properties props; struct backlight_properties props;
struct backlight_device *bl; struct backlight_device *bl;

View File

@ -735,7 +735,7 @@ static int s6e63m0_probe(struct spi_device *spi)
lcd->spi = spi; lcd->spi = spi;
lcd->dev = &spi->dev; lcd->dev = &spi->dev;
lcd->lcd_pd = spi->dev.platform_data; lcd->lcd_pd = dev_get_platdata(&spi->dev);
if (!lcd->lcd_pd) { if (!lcd->lcd_pd) {
dev_err(&spi->dev, "platform data is NULL.\n"); dev_err(&spi->dev, "platform data is NULL.\n");
return -EINVAL; return -EINVAL;

View File

@ -338,7 +338,7 @@ static int tdo24m_probe(struct spi_device *spi)
enum tdo24m_model model; enum tdo24m_model model;
int err; int err;
pdata = spi->dev.platform_data; pdata = dev_get_platdata(&spi->dev);
if (pdata) if (pdata)
model = pdata->model; model = pdata->model;
else else

View File

@ -38,7 +38,7 @@ struct tosa_bl_data {
static void tosa_bl_set_backlight(struct tosa_bl_data *data, int brightness) static void tosa_bl_set_backlight(struct tosa_bl_data *data, int brightness)
{ {
struct spi_device *spi = data->i2c->dev.platform_data; struct spi_device *spi = dev_get_platdata(&data->i2c->dev);
i2c_smbus_write_byte_data(data->i2c, DAC_CH1, data->comadj); i2c_smbus_write_byte_data(data->i2c, DAC_CH1, data->comadj);

View File

@ -287,12 +287,11 @@ static int tps65217_bl_probe(struct platform_device *pdev)
if (IS_ERR(pdata)) if (IS_ERR(pdata))
return PTR_ERR(pdata); return PTR_ERR(pdata);
} else { } else {
if (!pdev->dev.platform_data) { pdata = dev_get_platdata(&pdev->dev);
if (!pdata) {
dev_err(&pdev->dev, "no platform data provided\n"); dev_err(&pdev->dev, "no platform data provided\n");
return -EINVAL; return -EINVAL;
} }
pdata = pdev->dev.platform_data;
} }
tps65217_bl = devm_kzalloc(&pdev->dev, sizeof(*tps65217_bl), tps65217_bl = devm_kzalloc(&pdev->dev, sizeof(*tps65217_bl),

View File

@ -123,7 +123,7 @@ static const struct backlight_ops wm831x_backlight_ops = {
static int wm831x_backlight_probe(struct platform_device *pdev) static int wm831x_backlight_probe(struct platform_device *pdev)
{ {
struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent); struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);
struct wm831x_pdata *wm831x_pdata; struct wm831x_pdata *wm831x_pdata = dev_get_platdata(pdev->dev.parent);
struct wm831x_backlight_pdata *pdata; struct wm831x_backlight_pdata *pdata;
struct wm831x_backlight_data *data; struct wm831x_backlight_data *data;
struct backlight_device *bl; struct backlight_device *bl;
@ -131,12 +131,10 @@ static int wm831x_backlight_probe(struct platform_device *pdev)
int ret, i, max_isel, isink_reg, dcdc_cfg; int ret, i, max_isel, isink_reg, dcdc_cfg;
/* We need platform data */ /* We need platform data */
if (pdev->dev.parent->platform_data) { if (wm831x_pdata)
wm831x_pdata = pdev->dev.parent->platform_data;
pdata = wm831x_pdata->backlight; pdata = wm831x_pdata->backlight;
} else { else
pdata = NULL; pdata = NULL;
}
if (!pdata) { if (!pdata) {
dev_err(&pdev->dev, "No platform data supplied\n"); dev_err(&pdev->dev, "No platform data supplied\n");