Merge tag 'defconfig-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[linux-2.6-microblaze.git] / drivers / firmware / arm_scmi / driver.c

diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c
index 00fcacd..b406b3f 100644 (file)
--- a/drivers/firmware/arm_scmi/driver.c
+++ b/drivers/firmware/arm_scmi/driver.c
@@ -1787,6 +1787,21 @@ void scmi_protocol_device_unrequest(const struct scmi_device_id *id_table)
        mutex_unlock(&scmi_requested_devices_mtx);
 }
 
+static int scmi_cleanup_txrx_channels(struct scmi_info *info)
+{
+       int ret;
+       struct idr *idr = &info->tx_idr;
+
+       ret = idr_for_each(idr, info->desc->ops->chan_free, idr);
+       idr_destroy(&info->tx_idr);
+
+       idr = &info->rx_idr;
+       ret = idr_for_each(idr, info->desc->ops->chan_free, idr);
+       idr_destroy(&info->rx_idr);
+
+       return ret;
+}
+
 static int scmi_probe(struct platform_device *pdev)
 {
        int ret;
@@ -1833,7 +1848,7 @@ static int scmi_probe(struct platform_device *pdev)
 
        ret = scmi_xfer_info_init(info);
        if (ret)
-               return ret;
+               goto clear_txrx_setup;
 
        if (scmi_notification_init(handle))
                dev_err(dev, "SCMI Notifications NOT available.\n");
@@ -1846,7 +1861,7 @@ static int scmi_probe(struct platform_device *pdev)
        ret = scmi_protocol_acquire(handle, SCMI_PROTOCOL_BASE);
        if (ret) {
                dev_err(dev, "unable to communicate with SCMI\n");
-               return ret;
+               goto notification_exit;
        }
 
        mutex_lock(&scmi_list_mutex);
@@ -1885,6 +1900,12 @@ static int scmi_probe(struct platform_device *pdev)
        }
 
        return 0;
+
+notification_exit:
+       scmi_notification_exit(&info->handle);
+clear_txrx_setup:
+       scmi_cleanup_txrx_channels(info);
+       return ret;
 }
 
 void scmi_free_channel(struct scmi_chan_info *cinfo, struct idr *idr, int id)
@@ -1896,7 +1917,6 @@ static int scmi_remove(struct platform_device *pdev)
 {
        int ret = 0, id;
        struct scmi_info *info = platform_get_drvdata(pdev);
-       struct idr *idr = &info->tx_idr;
        struct device_node *child;
 
        mutex_lock(&scmi_list_mutex);
@@ -1920,14 +1940,7 @@ static int scmi_remove(struct platform_device *pdev)
        idr_destroy(&info->active_protocols);
 
        /* Safe to free channels since no more users */
-       ret = idr_for_each(idr, info->desc->ops->chan_free, idr);
-       idr_destroy(&info->tx_idr);
-
-       idr = &info->rx_idr;
-       ret = idr_for_each(idr, info->desc->ops->chan_free, idr);
-       idr_destroy(&info->rx_idr);
-
-       return ret;
+       return scmi_cleanup_txrx_channels(info);
 }
 
 static ssize_t protocol_version_show(struct device *dev,
@@ -2054,9 +2067,11 @@ static int __init scmi_driver_init(void)
 {
        int ret;
 
-       scmi_bus_init();
+       /* Bail out if no SCMI transport was configured */
+       if (WARN_ON(!IS_ENABLED(CONFIG_ARM_SCMI_HAVE_TRANSPORT)))
+               return -EINVAL;
 
-       BUILD_BUG_ON(!IS_ENABLED(CONFIG_ARM_SCMI_HAVE_TRANSPORT));
+       scmi_bus_init();
 
        /* Initialize any compiled-in transport which provided an init/exit */
        ret = scmi_transports_init();