Skip to content

Commit

Permalink
video: ssd1307fb: Convert driver to use ->probe_new()
Browse files Browse the repository at this point in the history
Use the ->probe_new() callback.

The driver does not use const struct i2c_device_id * argument,
so convert it to utilise the simplified I²C driver registration.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200324170532.44384-1-andriy.shevchenko@linux.intel.com
  • Loading branch information
Andy Shevchenko authored and Bartlomiej Zolnierkiewicz committed Apr 17, 2020
1 parent 9485654 commit 59d961c
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions drivers/video/fbdev/ssd1307fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -586,8 +586,7 @@ static const struct of_device_id ssd1307fb_of_match[] = {
};
MODULE_DEVICE_TABLE(of, ssd1307fb_of_match);

static int ssd1307fb_probe(struct i2c_client *client,
const struct i2c_device_id *id)
static int ssd1307fb_probe(struct i2c_client *client)
{
struct backlight_device *bl;
char bl_name[12];
Expand All @@ -599,11 +598,6 @@ static int ssd1307fb_probe(struct i2c_client *client,
void *vmem;
int ret;

if (!node) {
dev_err(&client->dev, "No device tree data found!\n");
return -EINVAL;
}

info = framebuffer_alloc(sizeof(struct ssd1307fb_par), &client->dev);
if (!info)
return -ENOMEM;
Expand Down Expand Up @@ -810,7 +804,7 @@ static const struct i2c_device_id ssd1307fb_i2c_id[] = {
MODULE_DEVICE_TABLE(i2c, ssd1307fb_i2c_id);

static struct i2c_driver ssd1307fb_driver = {
.probe = ssd1307fb_probe,
.probe_new = ssd1307fb_probe,
.remove = ssd1307fb_remove,
.id_table = ssd1307fb_i2c_id,
.driver = {
Expand Down

0 comments on commit 59d961c

Please sign in to comment.