Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-14 23:25:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

media: staging: atomisp: get rid of __KERNEL macros

Browse Source 
There's no sense for a Kernel driver to have __KERNEL macros
on it.

Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
Mauro Carvalho Chehab 2018-04-16 12:37:04 -04:00 committed by Mauro Carvalho Chehab
parent 22457cb2de
commit 313c5197c5
5 changed files with 0 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/system_local.h
View File

@ -31,23 +31,8 @@
#define HRT_ADDRESS_WIDTH 64 /* Surprise, this is a local property */
#endif
#if !defined(__KERNEL__) || (1 == 1)
/* This interface is deprecated */
#include "hrt/hive_types.h"
#else /* __KERNEL__ */
#include <type_support.h>
#if HRT_ADDRESS_WIDTH == 64
typedef uint64_t hrt_address;
#elif HRT_ADDRESS_WIDTH == 32
typedef uint32_t hrt_address;
#else
#error "system_local.h: HRT_ADDRESS_WIDTH must be one of {32,64}"
#endif
typedef uint32_t hrt_vaddress;
typedef uint32_t hrt_data;
#endif /* __KERNEL__ */
/*
* Cell specific address maps

15
drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/system_local.h
View File

@ -33,23 +33,8 @@
#define HRT_ADDRESS_WIDTH 64 /* Surprise, this is a local property */
#endif
#if !defined(__KERNEL__) || (1==1)
/* This interface is deprecated */
#include "hrt/hive_types.h"
#else /* __KERNEL__ */
#include <linux/types.h>
#if HRT_ADDRESS_WIDTH==64
typedef uint64_t hrt_address;
#elif HRT_ADDRESS_WIDTH==32
typedef uint32_t hrt_address;
#else
#error "system_local.h: HRT_ADDRESS_WIDTH must be one of {32,64}"
#endif
typedef uint32_t hrt_vaddress;
typedef uint32_t hrt_data;
#endif /* __KERNEL__ */
/*
* Cell specific address maps

5
drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/math_support.h
View File

@ -15,9 +15,7 @@
#ifndef __MATH_SUPPORT_H
#define __MATH_SUPPORT_H
#if defined(__KERNEL__)
#include <linux/kernel.h> /* Override the definition of max/min from linux kernel*/
#endif /*__KERNEL__*/
#if defined(_MSC_VER)
#include <stdlib.h> /* Override the definition of max/min from stdlib.h*/
@ -216,8 +214,5 @@ static inline unsigned int ceil_pow2(unsigned int a)
#define OP_std_modadd(base, offset, size) ((base+offset)%(size))
#endif /* !defined(__ISP) */
#if !defined(__KERNEL__)
#define clamp(a, min_val, max_val) MIN(MAX((a), (min_val)), (max_val))
#endif /* !defined(__KERNEL__) */
#endif /* __MATH_SUPPORT_H */

3
drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/print_support.h
View File

@ -17,9 +17,6 @@
#include <stdarg.h>
#if !defined(__KERNEL__)
#include <stdio.h>
#endif
extern int (*sh_css_printf) (const char *fmt, va_list args);
/* depends on host supplied print function in ia_css_init() */

4
drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_sp.c
View File

@ -1592,10 +1592,6 @@ ia_css_pipe_set_irq_mask(struct ia_css_pipe *pipe,
* - compare with (uint16_t)~0 or 0xffff
* - different assert for Linux and Windows
*/
#ifndef __KERNEL__
assert(or_mask <= UINT16_MAX);
assert(and_mask <= UINT16_MAX);
#endif
(void)HIVE_ADDR_host_sp_com; /* Suppres warnings in CRUN */