lkml.org 
[lkml]   [2021]   [Jul]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 13/19] auxdisplay: ht16k33: Add helper variable dev
    Date
    This driver has many users of "client->dev".  Add shorthands to simplify
    the code.

    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Acked-by: Robin van der Gracht <robin@protonic.nl>
    ---
    v3:
    - No changes,

    v2:
    - Add Acked-by,
    - Rebased.
    ---
    drivers/auxdisplay/ht16k33.c | 43 ++++++++++++++++++------------------
    1 file changed, 22 insertions(+), 21 deletions(-)

    diff --git a/drivers/auxdisplay/ht16k33.c b/drivers/auxdisplay/ht16k33.c
    index 8c1689b77db95676..75d326a823543898 100644
    --- a/drivers/auxdisplay/ht16k33.c
    +++ b/drivers/auxdisplay/ht16k33.c
    @@ -316,7 +316,8 @@ static void ht16k33_keypad_stop(struct input_dev *dev)
    static int ht16k33_keypad_probe(struct i2c_client *client,
    struct ht16k33_keypad *keypad)
    {
    - struct device_node *node = client->dev.of_node;
    + struct device *dev = &client->dev;
    + struct device_node *node = dev->of_node;
    u32 rows = HT16K33_MATRIX_KEYPAD_MAX_ROWS;
    u32 cols = HT16K33_MATRIX_KEYPAD_MAX_COLS;
    int err;
    @@ -324,7 +325,7 @@ static int ht16k33_keypad_probe(struct i2c_client *client,
    keypad->client = client;
    init_waitqueue_head(&keypad->wait);

    - keypad->dev = devm_input_allocate_device(&client->dev);
    + keypad->dev = devm_input_allocate_device(dev);
    if (!keypad->dev)
    return -ENOMEM;

    @@ -341,17 +342,17 @@ static int ht16k33_keypad_probe(struct i2c_client *client,
    err = of_property_read_u32(node, "debounce-delay-ms",
    &keypad->debounce_ms);
    if (err) {
    - dev_err(&client->dev, "key debounce delay not specified\n");
    + dev_err(dev, "key debounce delay not specified\n");
    return err;
    }

    - err = matrix_keypad_parse_of_params(&client->dev, &rows, &cols);
    + err = matrix_keypad_parse_of_params(dev, &rows, &cols);
    if (err)
    return err;
    if (rows > HT16K33_MATRIX_KEYPAD_MAX_ROWS ||
    cols > HT16K33_MATRIX_KEYPAD_MAX_COLS) {
    - dev_err(&client->dev, "%u rows or %u cols out of range in DT\n",
    - rows, cols);
    + dev_err(dev, "%u rows or %u cols out of range in DT\n", rows,
    + cols);
    return -ERANGE;
    }

    @@ -362,17 +363,17 @@ static int ht16k33_keypad_probe(struct i2c_client *client,
    err = matrix_keypad_build_keymap(NULL, NULL, rows, cols, NULL,
    keypad->dev);
    if (err) {
    - dev_err(&client->dev, "failed to build keymap\n");
    + dev_err(dev, "failed to build keymap\n");
    return err;
    }

    - err = devm_request_threaded_irq(&client->dev, client->irq,
    - NULL, ht16k33_keypad_irq_thread,
    + err = devm_request_threaded_irq(dev, client->irq, NULL,
    + ht16k33_keypad_irq_thread,
    IRQF_TRIGGER_HIGH | IRQF_ONESHOT,
    DRIVER_NAME, keypad);
    if (err) {
    - dev_err(&client->dev, "irq request failed %d, error %d\n",
    - client->irq, err);
    + dev_err(dev, "irq request failed %d, error %d\n", client->irq,
    + err);
    return err;
    }

    @@ -389,14 +390,15 @@ static int ht16k33_probe(struct i2c_client *client)
    struct backlight_properties bl_props;
    struct ht16k33_priv *priv;
    struct ht16k33_fbdev *fbdev;
    - struct device_node *node = client->dev.of_node;
    + struct device *dev = &client->dev;
    + struct device_node *node = dev->of_node;

    if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {
    - dev_err(&client->dev, "i2c_check_functionality error\n");
    + dev_err(dev, "i2c_check_functionality error\n");
    return -EIO;
    }

    - priv = devm_kzalloc(&client->dev, sizeof(*priv), GFP_KERNEL);
    + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
    if (!priv)
    return -ENOMEM;

    @@ -413,11 +415,10 @@ static int ht16k33_probe(struct i2c_client *client)
    bl_props.type = BACKLIGHT_RAW;
    bl_props.max_brightness = MAX_BRIGHTNESS;

    - bl = devm_backlight_device_register(&client->dev, DRIVER_NAME"-bl",
    - &client->dev, priv,
    + bl = devm_backlight_device_register(dev, DRIVER_NAME"-bl", dev, priv,
    &ht16k33_bl_ops, &bl_props);
    if (IS_ERR(bl)) {
    - dev_err(&client->dev, "failed to register backlight\n");
    + dev_err(dev, "failed to register backlight\n");
    return PTR_ERR(bl);
    }

    @@ -426,7 +427,7 @@ static int ht16k33_probe(struct i2c_client *client)
    if (err) {
    dft_brightness = MAX_BRIGHTNESS;
    } else if (dft_brightness > MAX_BRIGHTNESS) {
    - dev_warn(&client->dev,
    + dev_warn(dev,
    "invalid default brightness level: %u, using %u\n",
    dft_brightness, MAX_BRIGHTNESS);
    dft_brightness = MAX_BRIGHTNESS;
    @@ -441,13 +442,13 @@ static int ht16k33_probe(struct i2c_client *client)
    if (!fbdev->buffer)
    return -ENOMEM;

    - fbdev->cache = devm_kmalloc(&client->dev, HT16K33_FB_SIZE, GFP_KERNEL);
    + fbdev->cache = devm_kmalloc(dev, HT16K33_FB_SIZE, GFP_KERNEL);
    if (!fbdev->cache) {
    err = -ENOMEM;
    goto err_fbdev_buffer;
    }

    - fbdev->info = framebuffer_alloc(0, &client->dev);
    + fbdev->info = framebuffer_alloc(0, dev);
    if (!fbdev->info) {
    err = -ENOMEM;
    goto err_fbdev_buffer;
    @@ -456,7 +457,7 @@ static int ht16k33_probe(struct i2c_client *client)
    err = of_property_read_u32(node, "refresh-rate-hz",
    &fbdev->refresh_rate);
    if (err) {
    - dev_err(&client->dev, "refresh rate not specified\n");
    + dev_err(dev, "refresh rate not specified\n");
    goto err_fbdev_info;
    }
    fb_bl_default_curve(fbdev->info, 0, MIN_BRIGHTNESS, MAX_BRIGHTNESS);
    --
    2.25.1
    \
     
     \ /
      Last update: 2021-07-14 17:13    [W:3.857 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site