media: atomisp: Remove atomisp_streaming_count()

atomisp_streaming_count() is just an alias for isp->asd.streaming now,
replace it with directly checking that and remove the helper.

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>

diff --git a/drivers/staging/media/atomisp/pci/atomisp_cmd.c b/drivers/staging/media/atomisp/pci/atomisp_cmd.c
index 1482184a9ea572464a908670c9423e2e7d948007..b2bc9bc050bae0e85ada2b7966b3b5ab062bfa8e 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_cmd.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_cmd.c
@@ -472,7 +472,7 @@ irqreturn_t atomisp_isr(int irq, void *dev)
 
        clear_irq_reg(isp);
 
-       if (!atomisp_streaming_count(isp))
+       if (!isp->asd.streaming)
                goto out_nowake;
 
        if (isp->asd.streaming) {
@@ -947,7 +947,7 @@ void atomisp_assert_recovery_work(struct work_struct *work)
 
        mutex_lock(&isp->mutex);
 
-       if (!atomisp_streaming_count(isp))
+       if (!isp->asd.streaming)
                goto out_unlock;
 
        atomisp_css_irq_enable(isp, IA_CSS_IRQ_INFO_CSS_RECEIVER_SOF, false);
@@ -1074,7 +1074,7 @@ irqreturn_t atomisp_isr_thread(int irq, void *isp_ptr)
 
        spin_lock_irqsave(&isp->lock, flags);
 
-       if (!atomisp_streaming_count(isp)) {
+       if (!isp->asd.streaming) {
                spin_unlock_irqrestore(&isp->lock, flags);
                return IRQ_HANDLED;
        }

diff --git a/drivers/staging/media/atomisp/pci/atomisp_drvfs.c b/drivers/staging/media/atomisp/pci/atomisp_drvfs.c
index 3ddc935ec01d5932451f8728ace244310e13bc65..1df534bf54d3269139a39bf4584a70af97e2f571 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_drvfs.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_drvfs.c
@@ -69,7 +69,7 @@ static inline int iunit_dump_dbgopt(struct atomisp_device *isp,
                }
 
                if (opt & OPTION_BIN_RUN) {
-                       if (atomisp_streaming_count(isp)) {
+                       if (isp->asd.streaming) {
                                atomisp_css_dump_sp_raw_copy_linecount(true);
                                atomisp_css_debug_dump_isp_binary();
                        } else {

diff --git a/drivers/staging/media/atomisp/pci/atomisp_ioctl.c b/drivers/staging/media/atomisp/pci/atomisp_ioctl.c
index 020d4184375f080e009679b6ed20ad7edeb89ac0..6a062b86d18a4401505001ac6fdcaa052b55e787 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_ioctl.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_ioctl.c
@@ -599,11 +599,6 @@ static int atomisp_enum_input(struct file *file, void *fh,
        return 0;
 }
 
-unsigned int atomisp_streaming_count(struct atomisp_device *isp)
-{
-       return isp->asd.streaming;
-}
-
 /*
  * get input are used to get current primary/secondary camera
  */

diff --git a/drivers/staging/media/atomisp/pci/atomisp_ioctl.h b/drivers/staging/media/atomisp/pci/atomisp_ioctl.h
index db6da77df06b727a4eca38b9156601dbe7eff65e..997fa61589ab515910b95503587d78b486a2b30b 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_ioctl.h
+++ b/drivers/staging/media/atomisp/pci/atomisp_ioctl.h
@@ -47,8 +47,6 @@ enum ia_css_pipe_id atomisp_get_css_pipe_id(struct atomisp_sub_device
 
 extern const struct v4l2_ioctl_ops atomisp_ioctl_ops;
 
-unsigned int atomisp_streaming_count(struct atomisp_device *isp);
-
 /* compat_ioctl for 32bit userland app and 64bit kernel */
 long atomisp_compat_ioctl32(struct file *file,
                            unsigned int cmd, unsigned long arg);