On Fri, Jun 02, 2017 at 01:25:10PM +0200, Corentin Labbe wrote:

Instead of rewriting write/readq, use linux/io-64-nonatomic-lo-hi.h which already have them.

Signed-off-by: Corentin Labbe clabbe.montjoie@gmail.com

Applied to drm-misc-next

Thanks,

Sean

---

include/drm/drm_os_linux.h | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/include/drm/drm_os_linux.h b/include/drm/drm_os_linux.h index 35e1482ba8a1..10122353b744 100644 --- a/include/drm/drm_os_linux.h +++ b/include/drm/drm_os_linux.h @@ -6,19 +6,7 @@ #include <linux/interrupt.h> /* For task queue support */ #include <linux/sched/signal.h> #include <linux/delay.h>

-#ifndef readq -static inline u64 readq(void __iomem *reg) -{

• return ((u64) readl(reg)) | (((u64) readl(reg + 4UL)) << 32);

-}

-static inline void writeq(u64 val, void __iomem *reg) -{

• writel(val & 0xffffffff, reg);
• writel(val >> 32, reg + 0x4UL);

-} -#endif +#include <linux/io-64-nonatomic-lo-hi.h>

/** Current process ID */

#define DRM_CURRENTPID task_pid_nr(current)

2.13.0