media: atomisp: use atomisp_create_pipes_stream() in more places
authorHans de Goede <hdegoede@redhat.com>
Wed, 15 Jun 2022 20:50:33 +0000 (21:50 +0100)
committerMauro Carvalho Chehab <mchehab@kernel.org>
Fri, 8 Jul 2022 15:38:11 +0000 (16:38 +0100)
Use atomisp_create_pipes_stream() in 2 more places,
instead of open coding it.

Link: https://lore.kernel.org/linux-media/20220615205037.16549-37-hdegoede@redhat.com
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
drivers/staging/media/atomisp/pci/atomisp_compat_css20.c

index 358ef29f27bae10c849587faaf206df6e5f98027..76dab48cea677d91add45ce0dda731f75ee7a18f 100644 (file)
@@ -810,7 +810,6 @@ int atomisp_create_pipes_stream(struct atomisp_sub_device *asd)
 
 int atomisp_css_update_stream(struct atomisp_sub_device *asd)
 {
-       int ret;
        struct atomisp_device *isp = asd->isp;
 
        if (__destroy_streams(asd, true))
@@ -819,20 +818,7 @@ int atomisp_css_update_stream(struct atomisp_sub_device *asd)
        if (__destroy_pipes(asd, true))
                dev_warn(isp->dev, "destroy pipe failed.\n");
 
-       ret = __create_pipes(asd);
-       if (ret) {
-               dev_err(isp->dev, "create pipe failed %d.\n", ret);
-               return -EIO;
-       }
-
-       ret = __create_streams(asd);
-       if (ret) {
-               dev_warn(isp->dev, "create stream failed %d.\n", ret);
-               __destroy_pipes(asd, true);
-               return -EIO;
-       }
-
-       return 0;
+       return atomisp_create_pipes_stream(asd);
 }
 
 int atomisp_css_init(struct atomisp_device *isp)
@@ -1150,15 +1136,9 @@ int atomisp_css_start(struct atomisp_sub_device *asd,
         * recreated in the next stream on.
         */
        if (!asd->stream_prepared) {
-               if (__create_pipes(asd)) {
-                       dev_err(isp->dev, "create pipe error.\n");
-                       return -EINVAL;
-               }
-               if (__create_streams(asd)) {
-                       dev_err(isp->dev, "create stream error.\n");
-                       ret = -EINVAL;
-                       goto stream_err;
-               }
+               ret = atomisp_create_pipes_stream(asd);
+               if (ret)
+                       return ret;
        }
        /*
         * SP can only be started one time