media: atomisp: Replace last use of Intel MID APIs

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

Intel MID special header is not in use in this driver.
Replace it with a better macro for now on.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

authored by

Andy Shevchenko and committed by

Mauro Carvalho Chehab 5 years ago e651cc38 79317baa

+2 -4

2 changed files

expand all

drivers

staging

media

atomisp

include

linux

atomisp_platform.h

pci

atomisp_compat_css20.c

drivers/staging/media/atomisp/include/linux/atomisp_platform.h

··· 250 250 #define IS_MFLD __IS_SOC(INTEL_FAM6_ATOM_SALTWELL_MID) 251 251 #define IS_BYT __IS_SOC(INTEL_FAM6_ATOM_SILVERMONT) 252 252 #define IS_CHT __IS_SOC(INTEL_FAM6_ATOM_AIRMONT) 253 + #define IS_MRFD __IS_SOC(INTEL_FAM6_ATOM_SILVERMONT_MID) 253 254 #define IS_MOFD __IS_SOC(INTEL_FAM6_ATOM_AIRMONT_MID) 254 255 255 256 /* Both CHT and MOFD come with ISP2401 */

+1 -4

drivers/staging/media/atomisp/pci/atomisp_compat_css20.c

··· 33 33 #include "atomisp_ioctl.h" 34 34 #include "atomisp_acc.h" 35 35 36 - #include <asm/intel-mid.h> 37 - 38 36 #include "ia_css_debug.h" 39 37 #include "ia_css_isp_param.h" 40 38 #include "sh_css_hrt.h" ··· 1964 1966 true, 1965 1967 0x13000, 1966 1968 &size_mem_words) != 0) { 1967 - if (intel_mid_identify_cpu() == 1968 - INTEL_MID_CPU_CHIP_TANGIER) 1969 + if (IS_MRFD) 1969 1970 size_mem_words = CSS_MIPI_FRAME_BUFFER_SIZE_2; 1970 1971 else 1971 1972 size_mem_words = CSS_MIPI_FRAME_BUFFER_SIZE_1;