[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <e2413f79-53eb-40f2-8c20-75e181c3c486@linux.ibm.com>
Date: Tue, 27 Jan 2026 09:27:17 -0600
From: Eddie James <eajames@...ux.ibm.com>
To: Uwe Kleine-König <u.kleine-koenig@...libre.com>
Cc: Ninad Palsule <ninad@...ux.ibm.com>, linux-fsi@...ts.ozlabs.org,
linux-kernel@...r.kernel.org
Subject: Re: [PATCH v2 07/13] fsi: Create bus specific probe and remove
functions
On 12/9/25 5:40 AM, Uwe Kleine-König wrote:
> Introduce a bus specific probe and remove function. For now this only
> allows to get rid of a cast of the generic device to an fsi device in
> the drivers and changes the remove prototype to return void---a non-zero
> return value is ignored anyhow.
>
> The objective is to get rid of users of struct device callbacks
> .probe(), .remove() and .shutdown() to eventually remove these.
>
> Until all fsi drivers are converted this results in a runtime warning
> about the drivers needing an update because there is a bus probe
> function and a driver probe function.
Acked-by: Eddie James <eajames@...ux.ibm.com>
>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@...libre.com>
> ---
> drivers/fsi/fsi-core.c | 50 ++++++++++++++++++++++++++++++++++++++++++
> include/linux/fsi.h | 2 ++
> 2 files changed, 52 insertions(+)
>
> diff --git a/drivers/fsi/fsi-core.c b/drivers/fsi/fsi-core.c
> index 4e60d4b17c11..83599a1c548b 100644
> --- a/drivers/fsi/fsi-core.c
> +++ b/drivers/fsi/fsi-core.c
> @@ -128,9 +128,31 @@ static int fsi_bus_match(struct device *dev, const struct device_driver *drv)
> return 0;
> }
>
> +static int fsi_probe(struct device *dev)
> +{
> + struct fsi_device *fsidev = to_fsi_dev(dev);
> + struct fsi_driver *fsidrv = to_fsi_drv(dev->driver);
> +
> + if (fsidrv->probe)
> + return fsidrv->probe(fsidev);
> + else
> + return 0;
> +}
> +
> +static void fsi_remove(struct device *dev)
> +{
> + struct fsi_device *fsidev = to_fsi_dev(dev);
> + struct fsi_driver *fsidrv = to_fsi_drv(dev->driver);
> +
> + if (fsidrv->remove)
> + fsidrv->remove(fsidev);
> +}
> +
> static const struct bus_type fsi_bus_type = {
> .name = "fsi",
> .match = fsi_bus_match,
> + .probe = fsi_probe,
> + .remove = fsi_remove,
> };
>
> /*
> @@ -1392,6 +1414,25 @@ void fsi_master_unregister(struct fsi_master *master)
> }
> EXPORT_SYMBOL_GPL(fsi_master_unregister);
>
> +static int fsi_legacy_probe(struct fsi_device *fsidev)
> +{
> + struct device *dev = &fsidev->dev;
> + struct device_driver *driver = dev->driver;
> +
> + return driver->probe(dev);
> +}
> +
> +static void fsi_legacy_remove(struct fsi_device *fsidev)
> +{
> + struct device *dev = &fsidev->dev;
> + struct device_driver *driver = dev->driver;
> + int ret;
> +
> + ret = driver->remove(dev);
> + if (unlikely(ret))
> + dev_warn(dev, "Ignoring return value of remove callback (%pe)\n", ERR_PTR(ret));
> +}
> +
> int fsi_driver_register(struct fsi_driver *fsi_drv)
> {
> if (!fsi_drv)
> @@ -1401,6 +1442,15 @@ int fsi_driver_register(struct fsi_driver *fsi_drv)
>
> fsi_drv->drv.bus = &fsi_bus_type;
>
> + /*
> + * This driver needs updating. Note that driver_register() warns about
> + * this, so we're not adding another warning here.
> + */
> + if (!fsi_drv->probe && fsi_drv->drv.probe)
> + fsi_drv->probe = fsi_legacy_probe;
> + if (!fsi_drv->remove && fsi_drv->drv.remove)
> + fsi_drv->remove = fsi_legacy_remove;
> +
> return driver_register(&fsi_drv->drv);
> }
> EXPORT_SYMBOL_GPL(fsi_driver_register);
> diff --git a/include/linux/fsi.h b/include/linux/fsi.h
> index 3e3a8f3adac3..9c67c43f9e6c 100644
> --- a/include/linux/fsi.h
> +++ b/include/linux/fsi.h
> @@ -49,6 +49,8 @@ struct fsi_device_id {
> .engine_type = (t), .version = (v),
>
> struct fsi_driver {
> + int (*probe)(struct fsi_device *fsidev);
> + void (*remove)(struct fsi_device *fsidev);
> struct device_driver drv;
> const struct fsi_device_id *id_table;
> };
Powered by blists - more mailing lists