diff options
| author | Alan Cox <alan@linux.intel.com> | 2017-03-08 11:39:38 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-08 13:39:09 +0100 |
| commit | e35d4427b44217f8a1188e6301ea61bfafb37b4e (patch) | |
| tree | dcefe151feb8b657532760cb8105c3e01ee667af /drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_internal.h | |
| parent | 0d93fe75d44884e26fe3d2c308c2b0261fb655e8 (diff) | |
atomisp: __SP is never defined so scrub this ifdef
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_internal.h')
| -rw-r--r-- | drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_internal.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_internal.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_internal.h index c5a87b999ea2..6dbe77caea9a 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_internal.h +++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_internal.h @@ -33,7 +33,7 @@ #include "ia_css_buffer.h" #include "ia_css_binary.h" -#if !defined(__ISP) && !defined(__SP) +#if !defined(__ISP) #include "sh_css_firmware.h" /* not needed/desired on SP/ISP */ #endif #include "sh_css_legacy.h" @@ -557,12 +557,8 @@ struct sh_css_sp_pipeline { uint32_t running; /* needed for pipe termination */ hrt_vaddress sp_stage_addr[SH_CSS_MAX_STAGES]; hrt_vaddress scaler_pp_lut; /* Early bound LUT */ -#ifndef __SP uint32_t dummy; /* stage ptr is only used on sp but lives in this struct; needs cleanup */ -#else - struct sh_css_sp_stage *stage; /* Current stage for this pipeline */ -#endif int32_t num_execs; /* number of times to run if this is an acceleration pipe. */ #if defined(SH_CSS_ENABLE_METADATA) @@ -797,7 +793,7 @@ struct sh_css_hmm_buffer { * uint64_t does not exist on SP/ISP. * Size of the struct is checked by sp.hive.c. */ -#if !defined(__SP) && !defined(__ISP) +#if !defined(__ISP) CSS_ALIGN(uint64_t cookie_ptr, 8); /* TODO: check if this alignment is needed */ uint64_t kernel_ptr; #else @@ -1006,7 +1002,7 @@ sh_css_vprint(const char *fmt, va_list args) issue with the firmware struct/union's. More permanent solution will be to refactor this include. */ -#if !defined(__ISP) && !defined(__SP) +#if !defined(__ISP) hrt_vaddress sh_css_params_ddr_address_map(void); @@ -1114,6 +1110,6 @@ ia_css_get_crop_offsets( struct ia_css_pipe *pipe, struct ia_css_frame_info *in_frame); #endif -#endif /* !defined(__ISP) && !defined(__SP) */ +#endif /* !defined(__ISP) */ #endif /* _SH_CSS_INTERNAL_H_ */ |