media: atomisp: get rid of an iomem abstraction layer

The hive_isp_css_custom_host_hrt.h code, together
with atomisp_helper.h, provides an abstraction layer for
some functions inside atomisp_compat_css20.c and atomisp_cmd.c.

There's no good reason for that. In a matter of fact, after
removing the abstraction, the code looked a lot cleaner
and easier to understand.

So, get rid of them.

While here, get rid also of the udelay(1) abstraction code.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/staging/media/atomisp/pci/atomisp_cmd.c b/drivers/staging/media/atomisp/pci/atomisp_cmd.c
index 93855f981fbe77c78916fd333842fc4b9308cb07..7b936e5a5f037ac370e6921f72d9cda80c7f2b74 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_cmd.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_cmd.c
@@ -665,6 +665,7 @@ bool atomisp_buffers_queued_pipe(struct atomisp_video_pipe *pipe)
 void dump_sp_dmem(struct atomisp_device *isp, unsigned int addr,
                  unsigned int size)
 {
+       u32 __iomem *io_virt_addr;
        unsigned int data = 0;
        unsigned int size32 = DIV_ROUND_UP(size, sizeof(u32));
 
@@ -677,11 +678,11 @@ void dump_sp_dmem(struct atomisp_device *isp, unsigned int addr,
                return;
        }
        addr += SP_DMEM_BASE;
+       io_virt_addr = atomisp_io_base + (addr & 0x003FFFFF);
        do {
-               data = _hrt_master_port_uload_32(addr);
-
+               data = *io_virt_addr;
                dev_dbg(isp->dev, "%s, \t [0x%x]:0x%x\n", __func__, addr, data);
-               addr += sizeof(unsigned int);
+               io_virt_addr += sizeof(u32);
                size32 -= 1;
        } while (size32 > 0);
 }

diff --git a/drivers/staging/media/atomisp/pci/atomisp_cmd.h b/drivers/staging/media/atomisp/pci/atomisp_cmd.h
index 374f6914455d855ea839b98c3cb3bf0a77671f87..0bde995f1a8d377d17edd536b4d0ce72bd93b1dc 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_cmd.h
+++ b/drivers/staging/media/atomisp/pci/atomisp_cmd.h
@@ -65,16 +65,6 @@ bool atomisp_buffers_queued(struct atomisp_sub_device *asd);
 /* ISP2401 */
 bool atomisp_buffers_queued_pipe(struct atomisp_video_pipe *pipe);
 
-/* TODO:should be here instead of atomisp_helper.h
-extern void __iomem *atomisp_io_base;
-
-static inline void __iomem *atomisp_get_io_virt_addr(unsigned int address)
-{
-       void __iomem *ret = atomisp_io_base + (address & 0x003FFFFF);
-       return ret;
-}
-*/
-
 /*
  * Interrupt functions
  */

diff --git a/drivers/staging/media/atomisp/pci/atomisp_compat.h b/drivers/staging/media/atomisp/pci/atomisp_compat.h
index 6a2a81a3eb2337b45c197c2247a076ee0c8b3eb1..b2ed83c2f337a1cfb20434dacd4b7038213a8b45 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_compat.h
+++ b/drivers/staging/media/atomisp/pci/atomisp_compat.h
@@ -29,6 +29,8 @@ struct atomisp_sub_device;
 struct video_device;
 enum atomisp_input_stream_id;
 
+extern void __iomem *atomisp_io_base;
+
 struct atomisp_metadata_buf {
        struct ia_css_metadata *metadata;
        void *md_vptr;

diff --git a/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c b/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
index 8f2161f881b5d9336df1d3c77deda94772b878f5..c1e282a974d03fba568346677afd6c17a6b49cec 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
@@ -69,60 +69,66 @@ struct bayer_ds_factor {
 
 static void atomisp_css2_hw_store_8(hrt_address addr, uint8_t data)
 {
+       s8 __iomem *io_virt_addr = atomisp_io_base + (addr & 0x003FFFFF);
        unsigned long flags;
 
        spin_lock_irqsave(&mmio_lock, flags);
-       _hrt_master_port_store_8(addr, data);
+       *io_virt_addr = data;
        spin_unlock_irqrestore(&mmio_lock, flags);
 }
 
 static void atomisp_css2_hw_store_16(hrt_address addr, uint16_t data)
 {
+       s16 __iomem *io_virt_addr = atomisp_io_base + (addr & 0x003FFFFF);
        unsigned long flags;
 
        spin_lock_irqsave(&mmio_lock, flags);
-       _hrt_master_port_store_16(addr, data);
+       *io_virt_addr = data;
        spin_unlock_irqrestore(&mmio_lock, flags);
 }
 
 void atomisp_css2_hw_store_32(hrt_address addr, uint32_t data)
 {
+       s32 __iomem *io_virt_addr = atomisp_io_base + (addr & 0x003FFFFF);
        unsigned long flags;
 
        spin_lock_irqsave(&mmio_lock, flags);
-       _hrt_master_port_store_32(addr, data);
+       *io_virt_addr = data;
        spin_unlock_irqrestore(&mmio_lock, flags);
 }
 
 static uint8_t atomisp_css2_hw_load_8(hrt_address addr)
 {
+       s8 __iomem *io_virt_addr = atomisp_io_base + (addr & 0x003FFFFF);
        unsigned long flags;
        u8 ret;
 
        spin_lock_irqsave(&mmio_lock, flags);
-       ret = _hrt_master_port_load_8(addr);
+       ret = *io_virt_addr;
        spin_unlock_irqrestore(&mmio_lock, flags);
        return ret;
 }
 
 static uint16_t atomisp_css2_hw_load_16(hrt_address addr)
 {
+       s16 __iomem *io_virt_addr = atomisp_io_base + (addr & 0x003FFFFF);
        unsigned long flags;
        u16 ret;
 
        spin_lock_irqsave(&mmio_lock, flags);
-       ret = _hrt_master_port_load_16(addr);
+       ret = *io_virt_addr;
        spin_unlock_irqrestore(&mmio_lock, flags);
        return ret;
 }
 
 static uint32_t atomisp_css2_hw_load_32(hrt_address addr)
 {
+       s32 __iomem *io_virt_addr = atomisp_io_base + (addr & 0x003FFFFF);
        unsigned long flags;
        u32 ret;
 
        spin_lock_irqsave(&mmio_lock, flags);
-       ret = _hrt_master_port_load_32(addr);
+       ret = *io_virt_addr;
        spin_unlock_irqrestore(&mmio_lock, flags);
        return ret;
 }
@@ -130,27 +136,25 @@ static uint32_t atomisp_css2_hw_load_32(hrt_address addr)
 static void atomisp_css2_hw_store(hrt_address addr,
                                  const void *from, uint32_t n)
 {
+       s8 __iomem *io_virt_addr = atomisp_io_base + (addr & 0x003FFFFF);
        unsigned long flags;
        unsigned int i;
-       unsigned int _to = (unsigned int)addr;
-       const char *_from = (const char *)from;
 
        spin_lock_irqsave(&mmio_lock, flags);
-       for (i = 0; i < n; i++, _to++, _from++)
-               _hrt_master_port_store_8(_to, *_from);
+       for (i = 0; i < n; i++, io_virt_addr++, from++)
+               *io_virt_addr = *(s8 *)from;
        spin_unlock_irqrestore(&mmio_lock, flags);
 }
 
 static void atomisp_css2_hw_load(hrt_address addr, void *to, uint32_t n)
 {
+       s8 __iomem *io_virt_addr = atomisp_io_base + (addr & 0x003FFFFF);
        unsigned long flags;
        unsigned int i;
-       char *_to = (char *)to;
-       unsigned int _from = (unsigned int)addr;
 
        spin_lock_irqsave(&mmio_lock, flags);
-       for (i = 0; i < n; i++, _to++, _from++)
-               *_to = _hrt_master_port_load_8(_from);
+       for (i = 0; i < n; i++, to++, io_virt_addr++)
+               *(s8 *)to = *io_virt_addr;
        spin_unlock_irqrestore(&mmio_lock, flags);
 }
 
@@ -992,9 +996,9 @@ void atomisp_css_rx_clear_irq_info(enum mipi_port_id port,
 int atomisp_css_irq_enable(struct atomisp_device *isp,
                           enum ia_css_irq_info info, bool enable)
 {
-       dev_dbg(isp->dev, "%s: css irq info 0x%08x: %s.\n",
+       dev_dbg(isp->dev, "%s: css irq info 0x%08x: %s (%d).\n",
                __func__, info,
-               enable ? "enable" : "disable");
+               enable ? "enable" : "disable", enable);
        if (ia_css_irq_enable(info, enable)) {
                dev_warn(isp->dev, "%s:Invalid irq info: 0x%08x when %s.\n",
                         __func__, info,
@@ -4292,8 +4296,13 @@ bool atomisp_css_valid_sof(struct atomisp_device *isp)
                struct atomisp_sub_device *asd = &isp->asd[i];
                /* Loop for each css vc stream */
                for (j = 0; j < ATOMISP_INPUT_STREAM_NUM; j++) {
-                       if (asd->stream_env[j].stream &&
-                           asd->stream_env[j].stream_config.mode ==
+                       if (!asd->stream_env[j].stream)
+                               continue;
+
+                       dev_dbg(isp->dev,
+                               "stream #%d: mode: %d\n", j,
+                               asd->stream_env[j].stream_config.mode);
+                       if (asd->stream_env[j].stream_config.mode ==
                            IA_CSS_INPUT_MODE_BUFFERED_SENSOR)
                                return false;
                }

diff --git a/drivers/staging/media/atomisp/pci/atomisp_helper.h b/drivers/staging/media/atomisp/pci/atomisp_helper.h
deleted file mode 100644 (file)
index 3d685df..0000000
--- a/drivers/staging/media/atomisp/pci/atomisp_helper.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * Support for Medifield PNW Camera Imaging ISP subsystem.
- *
- * Copyright (c) 2010 Intel Corporation. All Rights Reserved.
- *
- * Copyright (c) 2010 Silicon Hive www.siliconhive.com.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License version
- * 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- *
- */
-#ifndef _atomisp_helper_h_
-#define _atomisp_helper_h_
-extern void __iomem *atomisp_io_base;
-
-static inline void __iomem *atomisp_get_io_virt_addr(unsigned int address)
-{
-       void __iomem *ret = atomisp_io_base + (address & 0x003FFFFF);
-       return ret;
-}
-#endif

diff --git a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/irq.c b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/irq.c
index 11448ca00a35fda8013fd01c3b19f650a0f6247f..80b5fd0dc9f6e004f599be322561eb5d45fede9b 100644 (file)
--- a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/irq.c
+++ b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/irq.c
@@ -21,8 +21,6 @@
 #endif
 #include "gp_device.h" /* _REG_GP_IRQ_REQUEST_ADDR */
 
-#include "platform_support.h"                  /* hrt_sleep() */
-
 static inline void irq_wait_for_write_complete(
     const irq_ID_t             ID);
 

diff --git a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/isp.c b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/isp.c
index 302ed32020b6243504afb132b0c483aaf476db99..4ad5e2db8a89b01e6877b062a32bb653e5c1642d 100644 (file)
--- a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/isp.c
+++ b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/isp.c
@@ -13,6 +13,8 @@
  * more details.
  */
 
+#include <linux/delay.h>
+
 #include <system_global.h>
 #include "isp.h"
 
@@ -21,7 +23,6 @@
 #endif /* __INLINE_ISP__ */
 
 #include "assert_support.h"
-#include "platform_support.h"                  /* hrt_sleep() */
 
 void cnd_isp_irq_enable(
     const isp_ID_t             ID,
@@ -125,5 +126,5 @@ void isp_wake(isp_ID_t ID)
 {
        assert(ID < N_ISP_ID);
        isp_ctrl_setbit(ID, ISP_SC_REG, ISP_START_BIT);
-       hrt_sleep();
+       udelay(1);
 }

diff --git a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/vmem.c b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/vmem.c
index 2f7b858d5d156b20a8ec4e34ad13d97d598366a0..6620f091442fa892a61170c33c0eeef838ed5c9b 100644 (file)
--- a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/vmem.c
+++ b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/vmem.c
@@ -21,7 +21,6 @@
 #include "ia_css_device_access.h"
 #endif
 #include "assert_support.h"
-#include "platform_support.h"                  /* hrt_sleep() */
 
 typedef unsigned long long hive_uedge;
 typedef hive_uedge *hive_wide;
@@ -155,7 +154,7 @@ static void load_vector(
                hive_sim_wide_unpack(data, &elem, ISP_VEC_ELEMBITS, i);
                to[i] = elem;
        }
-       hrt_sleep(); /* Spend at least 1 cycles per vector */
+       udelay(1); /* Spend at least 1 cycles per vector */
 }
 
 static void store_vector(
@@ -180,7 +179,7 @@ static void store_vector(
        //hrt_mem_store (ISP, VMEM, (unsigned)to, &v, siz); /* This will overwrite the next vector as well */
        hrt_master_port_store(ISP_BAMEM_BASE[ID] + (unsigned long)to, &v, size);
 #endif
-       hrt_sleep(); /* Spend at least 1 cycles per vector */
+       udelay(1); /* Spend at least 1 cycles per vector */
 }
 
 void isp_vmem_load(

diff --git a/drivers/staging/media/atomisp/pci/hive_isp_css_include/platform_support.h b/drivers/staging/media/atomisp/pci/hive_isp_css_include/platform_support.h
index 339edf5ff4e0ca962254972b2765c31f30da64cb..0cdef4a5e8b1bed9884133f1a0b9d853d59d43a4 100644 (file)
--- a/drivers/staging/media/atomisp/pci/hive_isp_css_include/platform_support.h
+++ b/drivers/staging/media/atomisp/pci/hive_isp_css_include/platform_support.h
@@ -25,9 +25,6 @@
 #include <linux/kernel.h>
 #include <linux/string.h>
 
-/* For definition of hrt_sleep() */
-#include "hive_isp_css_custom_host_hrt.h"
-
 #define UINT16_MAX USHRT_MAX
 #define UINT32_MAX UINT_MAX
 #define UCHAR_MAX  (255)

diff --git a/drivers/staging/media/atomisp/pci/hrt/hive_isp_css_custom_host_hrt.h b/drivers/staging/media/atomisp/pci/hrt/hive_isp_css_custom_host_hrt.h
deleted file mode 100644 (file)
index 7f22116..0000000
--- a/drivers/staging/media/atomisp/pci/hrt/hive_isp_css_custom_host_hrt.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * Support for Medifield PNW Camera Imaging ISP subsystem.
- *
- * Copyright (c) 2010 Intel Corporation. All Rights Reserved.
- *
- * Copyright (c) 2010 Silicon Hive www.siliconhive.com.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License version
- * 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- *
- */
-#ifndef _hive_isp_css_custom_host_hrt_h_
-#define _hive_isp_css_custom_host_hrt_h_
-
-#include <linux/delay.h>
-#include "atomisp_helper.h"
-
-/*
- * _hrt_master_port_store/load/uload -macros using __force attributed
- * cast to intentional dereferencing __iomem attributed (noderef)
- * pointer from atomisp_get_io_virt_addr
- */
-#define _hrt_master_port_store_8(a, d) \
-       (*((s8 __force *)atomisp_get_io_virt_addr(a)) = (d))
-
-#define _hrt_master_port_store_16(a, d) \
-       (*((s16 __force *)atomisp_get_io_virt_addr(a)) = (d))
-
-#define _hrt_master_port_store_32(a, d) \
-       (*((s32 __force *)atomisp_get_io_virt_addr(a)) = (d))
-
-#define _hrt_master_port_load_8(a) \
-       (*(s8 __force *)atomisp_get_io_virt_addr(a))
-
-#define _hrt_master_port_load_16(a) \
-       (*(s16 __force *)atomisp_get_io_virt_addr(a))
-
-#define _hrt_master_port_load_32(a) \
-       (*(s32 __force *)atomisp_get_io_virt_addr(a))
-
-#define _hrt_master_port_uload_8(a) \
-       (*(u8 __force *)atomisp_get_io_virt_addr(a))
-
-#define _hrt_master_port_uload_16(a) \
-       (*(u16 __force *)atomisp_get_io_virt_addr(a))
-
-#define _hrt_master_port_uload_32(a) \
-       (*(u32 __force *)atomisp_get_io_virt_addr(a))
-
-#define _hrt_master_port_store_8_volatile(a, d)  _hrt_master_port_store_8(a, d)
-#define _hrt_master_port_store_16_volatile(a, d) _hrt_master_port_store_16(a, d)
-#define _hrt_master_port_store_32_volatile(a, d) _hrt_master_port_store_32(a, d)
-
-#define _hrt_master_port_load_8_volatile(a)      _hrt_master_port_load_8(a)
-#define _hrt_master_port_load_16_volatile(a)     _hrt_master_port_load_16(a)
-#define _hrt_master_port_load_32_volatile(a)     _hrt_master_port_load_32(a)
-
-#define _hrt_master_port_uload_8_volatile(a)     _hrt_master_port_uload_8(a)
-#define _hrt_master_port_uload_16_volatile(a)    _hrt_master_port_uload_16(a)
-#define _hrt_master_port_uload_32_volatile(a)    _hrt_master_port_uload_32(a)
-
-static inline void hrt_sleep(void)
-{
-       udelay(1);
-}
-
-static inline u32 _hrt_mem_store(u32 to, const void *from, size_t n)
-{
-       unsigned int i;
-       u32 _to = to;
-       const char *_from = (const char *)from;
-
-       for (i = 0; i < n; i++, _to++, _from++)
-               _hrt_master_port_store_8(_to, *_from);
-       return _to;
-}
-
-static inline void *_hrt_mem_load(u32 from, void *to, size_t n)
-{
-       unsigned int i;
-       char *_to = (char *)to;
-       u32 _from = from;
-
-       for (i = 0; i < n; i++, _to++, _from++)
-               *_to = _hrt_master_port_load_8(_from);
-       return _to;
-}
-
-static inline u32 _hrt_mem_set(u32 to, int c, size_t n)
-{
-       unsigned int i;
-       u32 _to = to;
-
-       for (i = 0; i < n; i++, _to++)
-               _hrt_master_port_store_8(_to, c);
-       return _to;
-}
-
-#endif /* _hive_isp_css_custom_host_hrt_h_ */

diff --git a/drivers/staging/media/atomisp/pci/isp2400_system_local.h b/drivers/staging/media/atomisp/pci/isp2400_system_local.h
index da34e3e5f3fba08ee8358492422abefafaa92164..675b8e5bdcc1d7ddad52d26a81756162f4d15dab 100644 (file)
--- a/drivers/staging/media/atomisp/pci/isp2400_system_local.h
+++ b/drivers/staging/media/atomisp/pci/isp2400_system_local.h
@@ -20,8 +20,6 @@
 #ifndef HRT_USE_VIR_ADDRS
 #define HRT_USE_VIR_ADDRS
 #endif
-/* This interface is deprecated */
-/*#include "hive_isp_css_custom_host_hrt.h"*/
 #endif
 
 #include "system_global.h"

diff --git a/drivers/staging/media/atomisp/pci/isp2401_system_local.h b/drivers/staging/media/atomisp/pci/isp2401_system_local.h
index 4d9fe06ac1cc87f3c6ac4f656568b3a707608db4..b09f8faadb13b71ae4cc05a697a757fc909c71ea 100644 (file)
--- a/drivers/staging/media/atomisp/pci/isp2401_system_local.h
+++ b/drivers/staging/media/atomisp/pci/isp2401_system_local.h
@@ -20,8 +20,6 @@
 #ifndef HRT_USE_VIR_ADDRS
 #define HRT_USE_VIR_ADDRS
 #endif
-/* This interface is deprecated */
-/*#include "hive_isp_css_custom_host_hrt.h"*/
 #endif
 
 #include "system_global.h"

diff --git a/drivers/staging/media/atomisp/pci/runtime/event/src/event.c b/drivers/staging/media/atomisp/pci/runtime/event/src/event.c
index c608fa168fe6f031b64de5ae98fe764731fc8770..e702297b0a76528dff8acea36b72ff53391f6dbe 100644 (file)
--- a/drivers/staging/media/atomisp/pci/runtime/event/src/event.c
+++ b/drivers/staging/media/atomisp/pci/runtime/event/src/event.c
@@ -31,7 +31,6 @@
 /*#include "sp.h"*/    /* host2sp_enqueue_frame_data() */
 
 #include "assert_support.h"
-#include "platform_support.h"  /* hrt_sleep() */
 
 #include "ia_css_queue.h"      /* host_sp_enqueue_XXX */
 #include "ia_css_event.h"      /* ia_css_event_encode */

diff --git a/drivers/staging/media/atomisp/pci/runtime/eventq/src/eventq.c b/drivers/staging/media/atomisp/pci/runtime/eventq/src/eventq.c
index 0c0ba9f3d3d0ad1e7a97513dab265ee433240d6b..df75cef46a511a4ae1572f8785d1850a4d7f3aca 100644 (file)
--- a/drivers/staging/media/atomisp/pci/runtime/eventq/src/eventq.c
+++ b/drivers/staging/media/atomisp/pci/runtime/eventq/src/eventq.c
@@ -20,8 +20,6 @@
 #include "ia_css_event.h"      /* ia_css_event_encode()
                                ia_css_event_decode()
                                */
-#include "platform_support.h" /* hrt_sleep() */
-
 int ia_css_eventq_recv(
     ia_css_queue_t *eventq_handle,
     uint8_t *payload)
@@ -72,7 +70,7 @@ int ia_css_eventq_send(
                        break;
                }
                /* Wait for the queue to be not full and try again*/
-               hrt_sleep();
+               udelay(1);
        }
        return error;
 }

diff --git a/drivers/staging/media/atomisp/pci/runtime/inputfifo/src/inputfifo.c b/drivers/staging/media/atomisp/pci/runtime/inputfifo/src/inputfifo.c
index 3618b54464dad8204f7870fb64894ecc0b7deb72..38712530f5661bc7b13a1b24320a9f1d585efc25 100644 (file)
--- a/drivers/staging/media/atomisp/pci/runtime/inputfifo/src/inputfifo.c
+++ b/drivers/staging/media/atomisp/pci/runtime/inputfifo/src/inputfifo.c
@@ -104,7 +104,7 @@ static inline void
 _sh_css_fifo_snd(unsigned int token)
 {
        while (!can_event_send_token(STR2MIPI_EVENT_ID))
-               hrt_sleep();
+               udelay(1);
        event_send_token(STR2MIPI_EVENT_ID, token);
        return;
 }

diff --git a/drivers/staging/media/atomisp/pci/sh_css.c b/drivers/staging/media/atomisp/pci/sh_css.c
index bf8f147df5bb1d2c16db7bece9fec0e9f522e225..6676537f0e970ac16dd83e29da19bcf0424c898e 100644 (file)
--- a/drivers/staging/media/atomisp/pci/sh_css.c
+++ b/drivers/staging/media/atomisp/pci/sh_css.c
@@ -76,7 +76,6 @@
 #define __INLINE_GPIO__
 #include "gpio.h"
 #include "timed_ctrl.h"
-#include "platform_support.h" /* hrt_sleep(), inline */
 #include "ia_css_inputfifo.h"
 #define WITH_PC_MONITORING  0
 
@@ -10379,7 +10378,7 @@ ia_css_start_sp(void) {
        while ((ia_css_spctrl_get_state(SP0_ID) != IA_CSS_SP_SW_INITIALIZED) && timeout)
        {
                timeout--;
-               hrt_sleep();
+               udelay(1);
        }
        if (timeout == 0)
        {
@@ -10443,7 +10442,7 @@ ia_css_stop_sp(void) {
        while (!ia_css_spctrl_is_idle(SP0_ID) && timeout)
        {
                timeout--;
-               hrt_sleep();
+               udelay(1);
        }
        if ((ia_css_spctrl_get_state(SP0_ID) != IA_CSS_SP_SW_TERMINATED))
                IA_CSS_WARNING("SP has not terminated (SW)");
@@ -10457,7 +10456,7 @@ ia_css_stop_sp(void) {
        while (!isp_ctrl_getbit(ISP0_ID, ISP_SC_REG, ISP_IDLE_BIT) && timeout)
        {
                timeout--;
-               hrt_sleep();
+               udelay(1);
        }
        if (timeout == 0)
        {

diff --git a/drivers/staging/media/atomisp/pci/sh_css_hrt.c b/drivers/staging/media/atomisp/pci/sh_css_hrt.c
index c881edaa56d807b0b2d03a8d6eb0a79d41e411ac..06b502151af9e064a3b0cf0e07ccca2c4583cfeb 100644 (file)
--- a/drivers/staging/media/atomisp/pci/sh_css_hrt.c
+++ b/drivers/staging/media/atomisp/pci/sh_css_hrt.c
@@ -79,7 +79,7 @@ int sh_css_hrt_sp_wait(void)
               ((irq_reg_load(IRQ0_ID,
                              _HRT_IRQ_CONTROLLER_STATUS_REG_IDX) &
                 (1U << (irq_id + IRQ_SW_CHANNEL_OFFSET))) == 0)) {
-               hrt_sleep();
+               udelay(1);
        }
 
        return 0;

diff --git a/drivers/staging/media/atomisp/pci/sh_css_sp.c b/drivers/staging/media/atomisp/pci/sh_css_sp.c
index a40020ad699d105bd5610011825e46485bea6f07..a26680b1d0b02203be1baeb080594a007bfd0047 100644 (file)
--- a/drivers/staging/media/atomisp/pci/sh_css_sp.c
+++ b/drivers/staging/media/atomisp/pci/sh_css_sp.c
@@ -48,7 +48,6 @@
 
 
 #include "assert_support.h"
-#include "platform_support.h"  /* hrt_sleep() */
 
 #include "sw_event_global.h"                   /* Event IDs.*/
 #include "ia_css_event.h"