From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 067A0C433FE for ; Wed, 13 Oct 2021 07:28:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E631860E53 for ; Wed, 13 Oct 2021 07:28:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238450AbhJMHaQ (ORCPT ); Wed, 13 Oct 2021 03:30:16 -0400 Received: from protonic.xs4all.nl ([83.163.252.89]:56050 "EHLO protonic.xs4all.nl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238446AbhJMHaQ (ORCPT ); Wed, 13 Oct 2021 03:30:16 -0400 Received: from fiber.protonic.nl (edge2.prtnl [192.168.1.170]) by sparta.prtnl (Postfix) with ESMTP id 4595244A024F; Wed, 13 Oct 2021 09:28:11 +0200 (CEST) MIME-Version: 1.0 Date: Wed, 13 Oct 2021 09:28:11 +0200 From: Robin van der Gracht To: Geert Uytterhoeven Cc: Miguel Ojeda , Rob Herring , Paul Burton , Greg Kroah-Hartman , Pavel Machek , Marek Behun , devicetree@vger.kernel.org, linux-leds@vger.kernel.org, linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org, =?UTF-8?Q?Marek_Beh=C3=BAn?= , Andy Shevchenko Subject: Re: [PATCH v7 21/21] auxdisplay: ht16k33: Make use of device properties Reply-To: robin@protonic.nl In-Reply-To: <20211012183327.649865-22-geert@linux-m68k.org> References: <20211012183327.649865-1-geert@linux-m68k.org> <20211012183327.649865-22-geert@linux-m68k.org> User-Agent: Roundcube Webmail/1.4.11 Message-ID: <3c7f83cc18e820a76ea1d755955b7437@protonic.nl> X-Sender: robin@protonic.nl Organization: Protonic Holland Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Acked-by: Robin van der Gracht On 2021-10-12 20:33, Geert Uytterhoeven wrote: > The device property API allows drivers to gather device resources from > different sources, such as ACPI, and lift the dependency on Device Tree. > Convert the driver to unleash the power of the device property API. > > Suggested-by: Marek Behún > Signed-off-by: Geert Uytterhoeven > Reviewed-by: Andy Shevchenko > --- > v7: > - Integrate into this series, > - Add Reviewed-by, > - Use device_property_read_bool() as replacement for > of_get_property(), > - Call matrix_keypad_parse_properties() instead of > matrix_keypad_parse_of_params(). > --- > drivers/auxdisplay/Kconfig | 2 +- > drivers/auxdisplay/ht16k33.c | 27 ++++++++++++--------------- > 2 files changed, 13 insertions(+), 16 deletions(-) > > diff --git a/drivers/auxdisplay/Kconfig b/drivers/auxdisplay/Kconfig > index e32ef7f9945d49b2..64012cda4d126707 100644 > --- a/drivers/auxdisplay/Kconfig > +++ b/drivers/auxdisplay/Kconfig > @@ -169,7 +169,7 @@ config IMG_ASCII_LCD > > config HT16K33 > tristate "Holtek Ht16K33 LED controller with keyscan" > - depends on FB && OF && I2C && INPUT > + depends on FB && I2C && INPUT > select FB_SYS_FOPS > select FB_SYS_FILLRECT > select FB_SYS_COPYAREA > diff --git a/drivers/auxdisplay/ht16k33.c b/drivers/auxdisplay/ht16k33.c > index aef3dc87dc9f5ed2..1134ae9f30de4baa 100644 > --- a/drivers/auxdisplay/ht16k33.c > +++ b/drivers/auxdisplay/ht16k33.c > @@ -12,7 +12,7 @@ > #include > #include > #include > -#include > +#include > #include > #include > #include > @@ -491,15 +491,13 @@ static int ht16k33_led_probe(struct device *dev, > struct > led_classdev *led, > unsigned int brightness) > { > struct led_init_data init_data = {}; > - struct device_node *node; > int err; > > /* The LED is optional */ > - node = of_get_child_by_name(dev->of_node, "led"); > - if (!node) > + init_data.fwnode = device_get_named_child_node(dev, "led"); > + if (!init_data.fwnode) > return 0; > > - init_data.fwnode = of_fwnode_handle(node); > init_data.devicename = "auxdisplay"; > init_data.devname_mandatory = true; > > @@ -520,7 +518,6 @@ static int ht16k33_keypad_probe(struct i2c_client > *client, > struct ht16k33_keypad *keypad) > { > 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; > @@ -539,17 +536,17 @@ static int ht16k33_keypad_probe(struct i2c_client > *client, > keypad->dev->open = ht16k33_keypad_start; > keypad->dev->close = ht16k33_keypad_stop; > > - if (!of_get_property(node, "linux,no-autorepeat", NULL)) > + if (!device_property_read_bool(dev, "linux,no-autorepeat")) > __set_bit(EV_REP, keypad->dev->evbit); > > - err = of_property_read_u32(node, "debounce-delay-ms", > - &keypad->debounce_ms); > + err = device_property_read_u32(dev, "debounce-delay-ms", > + &keypad->debounce_ms); > if (err) { > dev_err(dev, "key debounce delay not specified\n"); > return err; > } > > - err = matrix_keypad_parse_of_params(dev, &rows, &cols); > + err = matrix_keypad_parse_properties(dev, &rows, &cols); > if (err) > return err; > if (rows > HT16K33_MATRIX_KEYPAD_MAX_ROWS || > @@ -634,8 +631,8 @@ static int ht16k33_fbdev_probe(struct device *dev, > struct > ht16k33_priv *priv, > goto err_fbdev_buffer; > } > > - err = of_property_read_u32(dev->of_node, "refresh-rate-hz", > - &fbdev->refresh_rate); > + err = device_property_read_u32(dev, "refresh-rate-hz", > + &fbdev->refresh_rate); > if (err) { > dev_err(dev, "refresh rate not specified\n"); > goto err_fbdev_info; > @@ -741,8 +738,8 @@ static int ht16k33_probe(struct i2c_client *client) > if (err) > return err; > > - err = of_property_read_u32(dev->of_node, "default-brightness-level", > - &dft_brightness); > + err = device_property_read_u32(dev, "default-brightness-level", > + &dft_brightness); > if (err) { > dft_brightness = MAX_BRIGHTNESS; > } else if (dft_brightness > MAX_BRIGHTNESS) { > @@ -830,7 +827,7 @@ static struct i2c_driver ht16k33_driver = { > .remove = ht16k33_remove, > .driver = { > .name = DRIVER_NAME, > - .of_match_table = of_match_ptr(ht16k33_of_match), > + .of_match_table = ht16k33_of_match, > }, > .id_table = ht16k33_i2c_match, > }; Met vriendelijke groet, Robin van der Gracht -- Protonic Holland Factorij 36 1689AL Zwaag +31 (0)229 212928 https://www.protonic.nl