fsi: Assign driver's bus in fsi_driver_register()

Instead of letting each driver assign the bus, do it once in the fsi
driver register function.

Simplify the fsi drivers that are living in drivers/fsi accordingly.

Once all fsi drivers dropped assigning the bus, fsi_bus_type can be made
a static variable.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
Acked-by: Eddie James <eajames@linux.ibm.com>
Link: https://patch.msgid.link/54804c2cd4d84a6b5fb679831122b6acdd36b168.1765279318.git.u.kleine-koenig@baylibre.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/fsi/fsi-core.c b/drivers/fsi/fsi-core.c
index c6c115993ebc13ed9faa2ab38422e07e28f6a9bc..e1ea1124282e4862afb067b131c686b3dc7b068e 100644 (file)
--- a/drivers/fsi/fsi-core.c
+++ b/drivers/fsi/fsi-core.c
@@ -1394,6 +1394,8 @@ int fsi_driver_register(struct fsi_driver *fsi_drv)
        if (!fsi_drv->id_table)
                return -EINVAL;
 
+       fsi_drv->drv.bus = &fsi_bus_type;
+
        return driver_register(&fsi_drv->drv);
 }
 EXPORT_SYMBOL_GPL(fsi_driver_register);

diff --git a/drivers/fsi/fsi-master-hub.c b/drivers/fsi/fsi-master-hub.c
index 6568fed7db3cf531fe423a449aa7a5196537c473..d389856d18acbc800d234facf9d12792152b7cf8 100644 (file)
--- a/drivers/fsi/fsi-master-hub.c
+++ b/drivers/fsi/fsi-master-hub.c
@@ -288,7 +288,6 @@ static struct fsi_driver hub_master_driver = {
        .id_table = hub_master_ids,
        .drv = {
                .name = "fsi-master-hub",
-               .bus = &fsi_bus_type,
                .probe = hub_master_probe,
                .remove = hub_master_remove,
        }

diff --git a/drivers/fsi/fsi-sbefifo.c b/drivers/fsi/fsi-sbefifo.c
index 5a08423d0c7ee703dd1e2410de9e7bb14d024fe4..fde1c34743a0e55698232e8e73dba86a271c4e58 100644 (file)
--- a/drivers/fsi/fsi-sbefifo.c
+++ b/drivers/fsi/fsi-sbefifo.c
@@ -1133,7 +1133,6 @@ static struct fsi_driver sbefifo_drv = {
        .id_table = sbefifo_ids,
        .drv = {
                .name = DEVICE_NAME,
-               .bus = &fsi_bus_type,
                .probe = sbefifo_probe,
                .remove = sbefifo_remove,
        }

diff --git a/drivers/fsi/fsi-scom.c b/drivers/fsi/fsi-scom.c
index f533106085acc104c6d25c9e462a3b8062e51297..2eda44451cc1cc1c7685c668ef202bacfcf48d39 100644 (file)
--- a/drivers/fsi/fsi-scom.c
+++ b/drivers/fsi/fsi-scom.c
@@ -606,7 +606,6 @@ static struct fsi_driver scom_drv = {
        .id_table = scom_ids,
        .drv = {
                .name = "scom",
-               .bus = &fsi_bus_type,
                .of_match_table = scom_of_ids,
                .probe = scom_probe,
                .remove = scom_remove,

diff --git a/drivers/fsi/i2cr-scom.c b/drivers/fsi/i2cr-scom.c
index cb7e02213032ccb86d4c1267266c4b3ecdaf0c0a..dfdb16afd2053ee3b8faac7a629ba2b6640682b5 100644 (file)
--- a/drivers/fsi/i2cr-scom.c
+++ b/drivers/fsi/i2cr-scom.c
@@ -140,7 +140,6 @@ static struct fsi_driver i2cr_scom_driver = {
        .id_table = i2cr_scom_ids,
        .drv = {
                .name = "i2cr_scom",
-               .bus = &fsi_bus_type,
                .of_match_table = i2cr_scom_of_ids,
                .probe = i2cr_scom_probe,
                .remove = i2cr_scom_remove,