From: Geert Uytterhoeven <geert@linux-m68k.org>
To: Robin van der Gracht <robin@protonic.nl>,
Rob Herring <robh+dt@kernel.org>, Miguel Ojeda <ojeda@kernel.org>,
Paul Burton <paulburton@kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: devicetree@vger.kernel.org, linux-mips@vger.kernel.org,
linux-kernel@vger.kernel.org,
Geert Uytterhoeven <geert@linux-m68k.org>
Subject: [PATCH 12/17] auxdisplay: ht16k33: Add helper variable dev
Date: Mon, 22 Mar 2021 15:48:43 +0100 [thread overview]
Message-ID: <20210322144848.1065067-13-geert@linux-m68k.org> (raw)
In-Reply-To: <20210322144848.1065067-1-geert@linux-m68k.org>
This driver has many users of "client->dev". Add shorthands to simplify
the code.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
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 1b67f38109bddba8..37fca1d44c3e73e1 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;
@@ -414,13 +416,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;
@@ -429,7 +431,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);
@@ -460,11 +462,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");
err = PTR_ERR(bl);
goto err_fbdev_unregister;
}
@@ -474,7 +475,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;
--
2.25.1
next prev parent reply other threads:[~2021-03-22 14:49 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-22 14:48 [PATCH 00/17] auxdisplay: ht16k33: Add character display support Geert Uytterhoeven
2021-03-22 14:48 ` [PATCH 01/17] uapi: Add <linux/map_to_14segment.h> Geert Uytterhoeven
2021-03-22 17:05 ` Miguel Ojeda
2021-03-22 17:51 ` Geert Uytterhoeven
2021-03-22 14:48 ` [PATCH 02/17] dt-bindings: auxdisplay: ht16k33: Document Adafruit segment displays Geert Uytterhoeven
2021-03-22 17:38 ` Rob Herring
2021-03-23 9:12 ` robin
2021-05-18 14:35 ` Geert Uytterhoeven
2021-05-19 10:37 ` Robin van der Gracht
2021-05-19 11:02 ` Geert Uytterhoeven
2021-03-22 14:48 ` [PATCH 03/17] auxdisplay: img-ascii-lcd: Fix lock-up when displaying empty string Geert Uytterhoeven
2021-03-22 14:48 ` [PATCH 04/17] auxdisplay: img-ascii-lcd: Add helper variable dev Geert Uytterhoeven
2021-03-22 16:59 ` Miguel Ojeda
2021-03-22 17:53 ` Geert Uytterhoeven
2021-03-22 14:48 ` [PATCH 05/17] auxdisplay: img-ascii-lcd: Convert device attribute to sysfs_emit() Geert Uytterhoeven
2021-03-22 14:48 ` [PATCH 06/17] auxdisplay: Extract character line display core support Geert Uytterhoeven
2021-03-23 8:18 ` robin
2021-03-23 8:52 ` Geert Uytterhoeven
2021-03-22 14:48 ` [PATCH 07/17] auxdisplay: linedisp: Use kmemdup_nul() helper Geert Uytterhoeven
2021-03-22 14:48 ` [PATCH 08/17] auxdisplay: linedisp: Add support for changing scroll rate Geert Uytterhoeven
2021-03-22 14:48 ` [PATCH 09/17] auxdisplay: ht16k33: Use HT16K33_FB_SIZE in ht16k33_initialize() Geert Uytterhoeven
2021-03-23 7:59 ` robin
2021-03-22 14:48 ` [PATCH 10/17] auxdisplay: ht16k33: Remove unneeded error check in keypad probe() Geert Uytterhoeven
2021-03-23 8:08 ` robin
2021-03-22 14:48 ` [PATCH 11/17] auxdisplay: ht16k33: Convert to simple i2c probe function Geert Uytterhoeven
2021-03-23 8:31 ` robin
2021-03-22 14:48 ` Geert Uytterhoeven [this message]
2021-03-23 8:57 ` [PATCH 12/17] auxdisplay: ht16k33: Add helper variable dev robin
2021-03-22 14:48 ` [PATCH 13/17] auxdisplay: ht16k33: Move delayed work Geert Uytterhoeven
2021-03-22 14:48 ` [PATCH 14/17] auxdisplay: ht16k33: Extract ht16k33_brightness_set() Geert Uytterhoeven
2021-03-22 14:48 ` [PATCH 15/17] auxdisplay: ht16k33: Extract frame buffer probing Geert Uytterhoeven
2021-03-22 14:48 ` [PATCH 16/17] auxdisplay: ht16k33: Add support for segment displays Geert Uytterhoeven
2021-03-29 7:08 ` Robin van der Gracht
2021-03-29 7:15 ` Geert Uytterhoeven
2021-03-29 7:30 ` Robin van der Gracht
2021-03-22 14:48 ` [PATCH 17/17] auxdisplay: ht16k33: Add segment display LED support Geert Uytterhoeven
2021-03-23 10:08 ` Robin van der Gracht
2021-03-23 12:32 ` Geert Uytterhoeven
2021-03-23 20:40 ` Pavel Machek
2021-03-24 8:31 ` Geert Uytterhoeven
2021-03-27 22:19 ` Pavel Machek
2021-06-25 12:39 ` Geert Uytterhoeven
2021-03-22 17:03 ` [PATCH 00/17] auxdisplay: ht16k33: Add character display support Miguel Ojeda
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210322144848.1065067-13-geert@linux-m68k.org \
--to=geert@linux-m68k.org \
--cc=devicetree@vger.kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=ojeda@kernel.org \
--cc=paulburton@kernel.org \
--cc=robh+dt@kernel.org \
--cc=robin@protonic.nl \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).