diff mbox series

[v2,08/16] serial: sc16is7xx: use i2c_get_match_data()

Message ID	20231221231823.2327894-9-hugo@hugovil.com
State	New
Headers	show Received: from mail.hugovil.com (mail.hugovil.com [162.243.120.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9A4C27996C; Thu, 21 Dec 2023 23:18:51 +0000 (UTC) From: Hugo Villeneuve <hugo@hugovil.com> To: gregkh@linuxfoundation.org, jirislaby@kernel.org, kubakici@wp.pl, indrakanti_ram@hotmail.com, phil@raspberrypi.org Cc: linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org, hugo@hugovil.com, Hugo Villeneuve <hvilleneuve@dimonoff.com>, Andy Shevchenko <andy.shevchenko@gmail.com> Date: Thu, 21 Dec 2023 18:18:15 -0500 Message-Id: <20231221231823.2327894-9-hugo@hugovil.com> In-Reply-To: <20231221231823.2327894-1-hugo@hugovil.com> References: <20231221231823.2327894-1-hugo@hugovil.com> Precedence: bulk MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [PATCH v2 08/16] serial: sc16is7xx: use i2c_get_match_data()
Series	serial: sc16is7xx: fixes, cleanups and improvements \| expand [v2,00/16] serial: sc16is7xx: fixes, cleanups and improvements [v2,01/16] serial: sc16is7xx: fix invalid sc16is7xx_lines bitfield in case of probe error [v2,02/16] serial: sc16is7xx: add check for unsupported SPI modes during probe [v2,03/16] serial: sc16is7xx: set safe default SPI clock frequency [v2,04/16] serial: sc16is7xx: remove obsolete loop in sc16is7xx_port_irq() [v2,05/16] serial: sc16is7xx: improve do/while loop in sc16is7xx_irq() [v2,06/16] serial: sc16is7xx: use DECLARE_BITMAP for sc16is7xx_lines bitfield [v2,07/16] serial: sc16is7xx: use spi_get_device_match_data() [v2,08/16] serial: sc16is7xx: use i2c_get_match_data() [v2,09/16] serial: sc16is7xx: add driver name to struct uart_driver [v2,10/16] serial: sc16is7xx: add macro for max number of UART ports [v2,11/16] serial: sc16is7xx: add explicit return for some switch default cases [v2,12/16] serial: sc16is7xx: replace hardcoded divisor value with BIT() macro [v2,13/16] serial: sc16is7xx: drop unneeded MODULE_ALIAS [v2,14/16] serial: sc16is7xx: refactor FIFO access functions to increase commonality [v2,15/16] serial: sc16is7xx: reorder code to remove prototype declarations [v2,16/16] serial: sc16is7xx: refactor EFR lock

Commit Message

Hugo Villeneuve Dec. 21, 2023, 11:18 p.m. UTC

From: Hugo Villeneuve <hvilleneuve@dimonoff.com>

Use preferred i2c_get_match_data() instead of device_get_match_data()
and i2c_client_get_device_id() to get the driver match data.

Suggested-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Hugo Villeneuve <hvilleneuve@dimonoff.com>
---
 drivers/tty/serial/sc16is7xx.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff mbox series

Patch

diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c
index 4161d692df40..e7f3184a70a1 100644
--- a/drivers/tty/serial/sc16is7xx.c
+++ b/drivers/tty/serial/sc16is7xx.c
@@ -1796,18 +1796,13 @@  MODULE_ALIAS("spi:sc16is7xx");
 #ifdef CONFIG_SERIAL_SC16IS7XX_I2C
 static int sc16is7xx_i2c_probe(struct i2c_client *i2c)
 {
-	const struct i2c_device_id *id = i2c_client_get_device_id(i2c);
 	const struct sc16is7xx_devtype *devtype;
 	struct regmap *regmaps[2];
 	unsigned int i;
 
-	if (i2c->dev.of_node) {
-		devtype = device_get_match_data(&i2c->dev);
-		if (!devtype)
-			return -ENODEV;
-	} else {
-		devtype = (struct sc16is7xx_devtype *)id->driver_data;
-	}
+	devtype = i2c_get_match_data(i2c);
+	if (!devtype)
+		return dev_err_probe(&i2c->dev, -ENODEV, "Failed to match device\n");
 
 	for (i = 0; i < devtype->nr_uart; i++) {
 		regcfg.name = sc16is7xx_regmap_name(i);