From: Mauro Carvalho Chehab Date: Wed, 22 Apr 2020 12:33:07 +0000 (+0200) Subject: media: atomisp: atomisp_compat_ioctl32.c: be independent of ISP version X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=483f5215a2f48e500717862f9dbb18823221894e;p=linux.git media: atomisp: atomisp_compat_ioctl32.c: be independent of ISP version There are two ioctls that are only available with ISP2401. Yet, at the compat level, we don't really need to take care, as the native ioctl handler will already return an error code if the ioctl doesn't exist. So, let's just remove the ifdefs here. Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c index 8a630b0d070f2..3079043f1fac0 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c +++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c @@ -1131,10 +1131,8 @@ long atomisp_compat_ioctl32(struct file *file, case ATOMISP_IOC_G_SENSOR_AE_BRACKETING_MODE: case ATOMISP_IOC_G_INVALID_FRAME_NUM: case ATOMISP_IOC_S_ARRAY_RESOLUTION: -#ifdef ISP2401 case ATOMISP_IOC_S_SENSOR_RUNMODE: case ATOMISP_IOC_G_UPDATE_EXPOSURE: -#endif ret = native_ioctl(file, cmd, arg); break;