platform/chrome: Centralize cros_ec_device allocation

Introduce a helper function, cros_ec_device_alloc(), to centralize the
allocation of the struct cros_ec_device.  Convert all protocol device
drivers to use this new function.

This is a preparatory step for separating common initialization logic
out of device drivers' probe() and cros_ec_register().

Link: https://lore.kernel.org/r/20250828083601.856083-2-tzungbi@kernel.org
Signed-off-by: Tzung-Bi Shih <tzungbi@kernel.org>

diff --git a/drivers/platform/chrome/cros_ec.c b/drivers/platform/chrome/cros_ec.c
index b1730362e399c7a5714f688cbb165ef4674aa030..25283a148ab9c041aba9b14fc1d4c5c48d700c5e 100644 (file)
--- a/drivers/platform/chrome/cros_ec.c
+++ b/drivers/platform/chrome/cros_ec.c
@@ -30,6 +30,18 @@ static struct cros_ec_platform pd_p = {
        .cmd_offset = EC_CMD_PASSTHRU_OFFSET(CROS_EC_DEV_PD_INDEX),
 };
 
+struct cros_ec_device *cros_ec_device_alloc(struct device *dev)
+{
+       struct cros_ec_device *ec_dev;
+
+       ec_dev = devm_kzalloc(dev, sizeof(*ec_dev), GFP_KERNEL);
+       if (!ec_dev)
+               return NULL;
+
+       return ec_dev;
+}
+EXPORT_SYMBOL(cros_ec_device_alloc);
+
 /**
  * cros_ec_irq_handler() - top half part of the interrupt handler
  * @irq: IRQ id

diff --git a/drivers/platform/chrome/cros_ec.h b/drivers/platform/chrome/cros_ec.h
index 6b95f1e0bace3def960fd0f837f13f1e1cbabb26..cd4643bc536710d33f4dc3f870272af35ee1d71e 100644 (file)
--- a/drivers/platform/chrome/cros_ec.h
+++ b/drivers/platform/chrome/cros_ec.h
@@ -11,6 +11,9 @@
 #include <linux/interrupt.h>
 
 struct cros_ec_device;
+struct device;
+
+struct cros_ec_device *cros_ec_device_alloc(struct device *dev);
 
 int cros_ec_register(struct cros_ec_device *ec_dev);
 void cros_ec_unregister(struct cros_ec_device *ec_dev);

diff --git a/drivers/platform/chrome/cros_ec_i2c.c b/drivers/platform/chrome/cros_ec_i2c.c
index 38af97cdaab2293e05036387cc278fb37f8e5441..ee3c5130ec3f7f09ae653e312903478ad6abc3f0 100644 (file)
--- a/drivers/platform/chrome/cros_ec_i2c.c
+++ b/drivers/platform/chrome/cros_ec_i2c.c
@@ -289,10 +289,10 @@ done:
 static int cros_ec_i2c_probe(struct i2c_client *client)
 {
        struct device *dev = &client->dev;
-       struct cros_ec_device *ec_dev = NULL;
+       struct cros_ec_device *ec_dev;
        int err;
 
-       ec_dev = devm_kzalloc(dev, sizeof(*ec_dev), GFP_KERNEL);
+       ec_dev = cros_ec_device_alloc(dev);
        if (!ec_dev)
                return -ENOMEM;
 

diff --git a/drivers/platform/chrome/cros_ec_ishtp.c b/drivers/platform/chrome/cros_ec_ishtp.c
index 7e7190b30cbb9779c88e73ef45af1c24949fcc15..c102a796670c642fd648810c7ef9e6e3d9657e12 100644 (file)
--- a/drivers/platform/chrome/cros_ec_ishtp.c
+++ b/drivers/platform/chrome/cros_ec_ishtp.c
@@ -543,7 +543,7 @@ static int cros_ec_dev_init(struct ishtp_cl_data *client_data)
        struct cros_ec_device *ec_dev;
        struct device *dev = cl_data_to_dev(client_data);
 
-       ec_dev = devm_kzalloc(dev, sizeof(*ec_dev), GFP_KERNEL);
+       ec_dev = cros_ec_device_alloc(dev);
        if (!ec_dev)
                return -ENOMEM;
 

diff --git a/drivers/platform/chrome/cros_ec_lpc.c b/drivers/platform/chrome/cros_ec_lpc.c
index 7d9a78289c9626e797a41acae8f62d1bdc0d83a2..30fa89b81666cff767176f01642c8b6cec41e112 100644 (file)
--- a/drivers/platform/chrome/cros_ec_lpc.c
+++ b/drivers/platform/chrome/cros_ec_lpc.c
@@ -637,7 +637,7 @@ static int cros_ec_lpc_probe(struct platform_device *pdev)
                }
        }
 
-       ec_dev = devm_kzalloc(dev, sizeof(*ec_dev), GFP_KERNEL);
+       ec_dev = cros_ec_device_alloc(dev);
        if (!ec_dev)
                return -ENOMEM;
 

diff --git a/drivers/platform/chrome/cros_ec_rpmsg.c b/drivers/platform/chrome/cros_ec_rpmsg.c
index bc2666491db1f16a8b366d8dd9aca9a5aade6018..9ac2b923db6ded6988980691ec6e67838df4ac51 100644 (file)
--- a/drivers/platform/chrome/cros_ec_rpmsg.c
+++ b/drivers/platform/chrome/cros_ec_rpmsg.c
@@ -216,7 +216,7 @@ static int cros_ec_rpmsg_probe(struct rpmsg_device *rpdev)
        struct cros_ec_device *ec_dev;
        int ret;
 
-       ec_dev = devm_kzalloc(dev, sizeof(*ec_dev), GFP_KERNEL);
+       ec_dev = cros_ec_device_alloc(dev);
        if (!ec_dev)
                return -ENOMEM;
 

diff --git a/drivers/platform/chrome/cros_ec_spi.c b/drivers/platform/chrome/cros_ec_spi.c
index 8ca0f854e7ac56a9b2a68673d5eda851911eabba..c778300a4145d444092030afb1c5ceb29c8a10d3 100644 (file)
--- a/drivers/platform/chrome/cros_ec_spi.c
+++ b/drivers/platform/chrome/cros_ec_spi.c
@@ -749,7 +749,7 @@ static int cros_ec_spi_probe(struct spi_device *spi)
        if (ec_spi == NULL)
                return -ENOMEM;
        ec_spi->spi = spi;
-       ec_dev = devm_kzalloc(dev, sizeof(*ec_dev), GFP_KERNEL);
+       ec_dev = cros_ec_device_alloc(dev);
        if (!ec_dev)
                return -ENOMEM;
 

diff --git a/drivers/platform/chrome/cros_ec_uart.c b/drivers/platform/chrome/cros_ec_uart.c
index 19c179d49c90df0ee11f2ddb8eda4ebda7931bdb..1a7511b1bbe378d9b9502345cbf425dbc5f529a8 100644 (file)
--- a/drivers/platform/chrome/cros_ec_uart.c
+++ b/drivers/platform/chrome/cros_ec_uart.c
@@ -259,7 +259,7 @@ static int cros_ec_uart_probe(struct serdev_device *serdev)
        if (!ec_uart)
                return -ENOMEM;
 
-       ec_dev = devm_kzalloc(dev, sizeof(*ec_dev), GFP_KERNEL);
+       ec_dev = cros_ec_device_alloc(dev);
        if (!ec_dev)
                return -ENOMEM;