redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

video: ssd1307fb: Introduce temporary variable to increase readability

Browse source 
Introduce temporary variable to increase readability of the code.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
[b.zolnierkie: fix lines over 80 characters]
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200324170532.44384-2-andriy.shevchenko@linux.intel.com
This commit is contained in:
Andy Shevchenko 2020-03-24 19:05:29 +02:00 committed by Bartlomiej Zolnierkiewicz
parent 59d961c597
commit fa64c6bade
1 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
drivers/video/fbdev/ssd1307fb.c
View file

@ -588,6 +588,7 @@ MODULE_DEVICE_TABLE(of, ssd1307fb_of_match);
static int ssd1307fb_probe(struct i2c_client *client) static int ssd1307fb_probe(struct i2c_client *client)
{ {
struct device *dev = &client->dev;
struct backlight_device *bl; struct backlight_device *bl;
char bl_name[12]; char bl_name[12];
struct fb_info *info; struct fb_info *info;
@ -598,7 +599,7 @@ static int ssd1307fb_probe(struct i2c_client *client)
void *vmem; void *vmem;
int ret; int ret;
info = framebuffer_alloc(sizeof(struct ssd1307fb_par), &client->dev); info = framebuffer_alloc(sizeof(struct ssd1307fb_par), dev);
if (!info) if (!info)
return -ENOMEM; return -ENOMEM;
@ -608,23 +609,21 @@ static int ssd1307fb_probe(struct i2c_client *client)
par->device_info = of_device_get_match_data(&client->dev); par->device_info = of_device_get_match_data(&client->dev);
par->reset = devm_gpiod_get_optional(&client->dev, "reset", par->reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_LOW);
GPIOD_OUT_LOW);
if (IS_ERR(par->reset)) { if (IS_ERR(par->reset)) {
dev_err(&client->dev, "failed to get reset gpio: %ld\n", dev_err(dev, "failed to get reset gpio: %ld\n",
PTR_ERR(par->reset)); PTR_ERR(par->reset));
ret = PTR_ERR(par->reset); ret = PTR_ERR(par->reset);
goto fb_alloc_error; goto fb_alloc_error;
} }
par->vbat_reg = devm_regulator_get_optional(&client->dev, "vbat"); par->vbat_reg = devm_regulator_get_optional(dev, "vbat");
if (IS_ERR(par->vbat_reg)) { if (IS_ERR(par->vbat_reg)) {
ret = PTR_ERR(par->vbat_reg); ret = PTR_ERR(par->vbat_reg);
if (ret == -ENODEV) { if (ret == -ENODEV) {
par->vbat_reg = NULL; par->vbat_reg = NULL;
} else { } else {
dev_err(&client->dev, "failed to get VBAT regulator: %d\n", dev_err(dev, "failed to get VBAT regulator: %d\n", ret);
ret);
goto fb_alloc_error; goto fb_alloc_error;
} }
} }
@ -674,15 +673,15 @@ static int ssd1307fb_probe(struct i2c_client *client)
vmem = (void *)__get_free_pages(GFP_KERNEL | __GFP_ZERO, vmem = (void *)__get_free_pages(GFP_KERNEL | __GFP_ZERO,
get_order(vmem_size)); get_order(vmem_size));
if (!vmem) { if (!vmem) {
dev_err(&client->dev, "Couldn't allocate graphical memory.\n"); dev_err(dev, "Couldn't allocate graphical memory.\n");
ret = -ENOMEM; ret = -ENOMEM;
goto fb_alloc_error; goto fb_alloc_error;
} }
ssd1307fb_defio = devm_kzalloc(&client->dev, sizeof(*ssd1307fb_defio), ssd1307fb_defio = devm_kzalloc(dev, sizeof(*ssd1307fb_defio),
GFP_KERNEL); GFP_KERNEL);
if (!ssd1307fb_defio) { if (!ssd1307fb_defio) {
dev_err(&client->dev, "Couldn't allocate deferred io.\n"); dev_err(dev, "Couldn't allocate deferred io.\n");
ret = -ENOMEM; ret = -ENOMEM;
goto fb_alloc_error; goto fb_alloc_error;
} }
@ -720,8 +719,7 @@ static int ssd1307fb_probe(struct i2c_client *client)
if (par->vbat_reg) { if (par->vbat_reg) {
ret = regulator_enable(par->vbat_reg); ret = regulator_enable(par->vbat_reg);
if (ret) { if (ret) {
dev_err(&client->dev, "failed to enable VBAT: %d\n", dev_err(dev, "failed to enable VBAT: %d\n", ret);
ret);
goto reset_oled_error; goto reset_oled_error;
} }
} }
@ -732,17 +730,16 @@ static int ssd1307fb_probe(struct i2c_client *client)
ret = register_framebuffer(info); ret = register_framebuffer(info);
if (ret) { if (ret) {
dev_err(&client->dev, "Couldn't register the framebuffer\n"); dev_err(dev, "Couldn't register the framebuffer\n");
goto panel_init_error; goto panel_init_error;
} }
snprintf(bl_name, sizeof(bl_name), "ssd1307fb%d", info->node); snprintf(bl_name, sizeof(bl_name), "ssd1307fb%d", info->node);
bl = backlight_device_register(bl_name, &client->dev, par, bl = backlight_device_register(bl_name, dev, par, &ssd1307fb_bl_ops,
&ssd1307fb_bl_ops, NULL); NULL);
if (IS_ERR(bl)) { if (IS_ERR(bl)) {
ret = PTR_ERR(bl); ret = PTR_ERR(bl);
dev_err(&client->dev, "unable to register backlight device: %d\n", dev_err(dev, "unable to register backlight device: %d\n", ret);
ret);
goto bl_init_error; goto bl_init_error;
} }
@ -750,7 +747,7 @@ static int ssd1307fb_probe(struct i2c_client *client)
bl->props.max_brightness = MAX_CONTRAST; bl->props.max_brightness = MAX_CONTRAST;
info->bl_dev = bl; info->bl_dev = bl;
dev_info(&client->dev, "fb%d: %s framebuffer device registered, using %d bytes of video memory\n", info->node, info->fix.id, vmem_size); dev_info(dev, "fb%d: %s framebuffer device registered, using %d bytes of video memory\n", info->node, info->fix.id, vmem_size);
return 0; return 0;