media: intel/ipu6: Move isys_remove() close to isys_probe()

In preparation to fixing a leak in isys_probe(), move isys_remove().
The fix will introduce a new function that will also be called from
isys_remove(). The code needs to be rearranged to avoid a forward
declaration.

Having the .remove function close to the .probe function is also more
standard.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys.c b/drivers/media/pci/intel/ipu6/ipu6-isys.c
index 5992138c7290dc5638b757017f8a41036c1e38fb..7ce2047a09b5973a12d4f562638014d96d71f153 100644 (file)
--- a/drivers/media/pci/intel/ipu6/ipu6-isys.c
+++ b/drivers/media/pci/intel/ipu6/ipu6-isys.c
@@ -925,41 +925,6 @@ static const struct dev_pm_ops isys_pm_ops = {
        .resume = isys_resume,
 };
 
-static void isys_remove(struct auxiliary_device *auxdev)
-{
-       struct ipu6_bus_device *adev = auxdev_to_adev(auxdev);
-       struct ipu6_isys *isys = dev_get_drvdata(&auxdev->dev);
-       struct ipu6_device *isp = adev->isp;
-       struct isys_fw_msgs *fwmsg, *safe;
-       unsigned int i;
-
-       list_for_each_entry_safe(fwmsg, safe, &isys->framebuflist, head)
-               dma_free_attrs(&auxdev->dev, sizeof(struct isys_fw_msgs),
-                              fwmsg, fwmsg->dma_addr, 0);
-
-       list_for_each_entry_safe(fwmsg, safe, &isys->framebuflist_fw, head)
-               dma_free_attrs(&auxdev->dev, sizeof(struct isys_fw_msgs),
-                              fwmsg, fwmsg->dma_addr, 0);
-
-       isys_unregister_devices(isys);
-       isys_notifier_cleanup(isys);
-
-       cpu_latency_qos_remove_request(&isys->pm_qos);
-
-       if (!isp->secure_mode) {
-               ipu6_cpd_free_pkg_dir(adev);
-               ipu6_buttress_unmap_fw_image(adev, &adev->fw_sgt);
-               release_firmware(adev->fw);
-       }
-
-       for (i = 0; i < IPU6_ISYS_MAX_STREAMS; i++)
-               mutex_destroy(&isys->streams[i].mutex);
-
-       isys_iwake_watermark_cleanup(isys);
-       mutex_destroy(&isys->stream_mutex);
-       mutex_destroy(&isys->mutex);
-}
-
 static int alloc_fw_msg_bufs(struct ipu6_isys *isys, int amount)
 {
        struct device *dev = &isys->adev->auxdev.dev;
@@ -1167,6 +1132,41 @@ release_firmware:
        return ret;
 }
 
+static void isys_remove(struct auxiliary_device *auxdev)
+{
+       struct ipu6_bus_device *adev = auxdev_to_adev(auxdev);
+       struct ipu6_isys *isys = dev_get_drvdata(&auxdev->dev);
+       struct ipu6_device *isp = adev->isp;
+       struct isys_fw_msgs *fwmsg, *safe;
+       unsigned int i;
+
+       list_for_each_entry_safe(fwmsg, safe, &isys->framebuflist, head)
+               dma_free_attrs(&auxdev->dev, sizeof(struct isys_fw_msgs),
+                              fwmsg, fwmsg->dma_addr, 0);
+
+       list_for_each_entry_safe(fwmsg, safe, &isys->framebuflist_fw, head)
+               dma_free_attrs(&auxdev->dev, sizeof(struct isys_fw_msgs),
+                              fwmsg, fwmsg->dma_addr, 0);
+
+       isys_unregister_devices(isys);
+       isys_notifier_cleanup(isys);
+
+       cpu_latency_qos_remove_request(&isys->pm_qos);
+
+       if (!isp->secure_mode) {
+               ipu6_cpd_free_pkg_dir(adev);
+               ipu6_buttress_unmap_fw_image(adev, &adev->fw_sgt);
+               release_firmware(adev->fw);
+       }
+
+       for (i = 0; i < IPU6_ISYS_MAX_STREAMS; i++)
+               mutex_destroy(&isys->streams[i].mutex);
+
+       isys_iwake_watermark_cleanup(isys);
+       mutex_destroy(&isys->stream_mutex);
+       mutex_destroy(&isys->mutex);
+}
+
 struct fwmsg {
        int type;
        char *msg;