| Message ID | 20210106155201.2845319-1-maennich@google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | staging: ION: remove some references to CONFIG_ION | expand |
On Wed, Jan 06, 2021 at 03:52:01PM +0000, Matthias Maennich wrote: > With commit e722a295cf49 ("staging: ion: remove from the tree"), ION and > its corresponding config CONFIG_ION is gone. Remove stale references > from drivers/staging/media/atomisp/pci and from the recommended Android > kernel config. > > Fixes: e722a295cf49 ("staging: ion: remove from the tree") > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Cc: Hridya Valsaraju <hridya@google.com> > Cc: Rob Herring <robh@kernel.org> > Cc: linux-media@vger.kernel.org > Cc: devel@driverdev.osuosl.org > Signed-off-by: Matthias Maennich <maennich@google.com> > --- > .../media/atomisp/pci/atomisp_subdev.c | 20 ------------------- > kernel/configs/android-recommended.config | 1 - > 2 files changed, 21 deletions(-) Thanks for finding these remnants, I'll go queue this up now. greg k-h
diff --git a/drivers/staging/media/atomisp/pci/atomisp_subdev.c b/drivers/staging/media/atomisp/pci/atomisp_subdev.c index 52b9fb18c87f..b666cb23e5ca 100644 --- a/drivers/staging/media/atomisp/pci/atomisp_subdev.c +++ b/drivers/staging/media/atomisp/pci/atomisp_subdev.c @@ -1062,26 +1062,6 @@ static const struct v4l2_ctrl_config ctrl_select_isp_version = { .def = 0, }; -#if 0 /* #ifdef CONFIG_ION */ -/* - * Control for ISP ion device fd - * - * userspace will open ion device and pass the fd to kernel. - * this fd will be used to map shared fd to buffer. - */ -/* V4L2_CID_ATOMISP_ION_DEVICE_FD is not defined */ -static const struct v4l2_ctrl_config ctrl_ion_dev_fd = { - .ops = &ctrl_ops, - .id = V4L2_CID_ATOMISP_ION_DEVICE_FD, - .type = V4L2_CTRL_TYPE_INTEGER, - .name = "Ion Device Fd", - .min = -1, - .max = 1024, - .step = 1, - .def = ION_FD_UNSET -}; -#endif - static void atomisp_init_subdev_pipe(struct atomisp_sub_device *asd, struct atomisp_video_pipe *pipe, enum v4l2_buf_type buf_type) { diff --git a/kernel/configs/android-recommended.config b/kernel/configs/android-recommended.config index 53d688bdd894..eb0029c9a6a6 100644 --- a/kernel/configs/android-recommended.config +++ b/kernel/configs/android-recommended.config @@ -81,7 +81,6 @@ CONFIG_INPUT_JOYSTICK=y CONFIG_INPUT_MISC=y CONFIG_INPUT_TABLET=y CONFIG_INPUT_UINPUT=y -CONFIG_ION=y CONFIG_JOYSTICK_XPAD=y CONFIG_JOYSTICK_XPAD_FF=y CONFIG_JOYSTICK_XPAD_LEDS=y
With commit e722a295cf49 ("staging: ion: remove from the tree"), ION and its corresponding config CONFIG_ION is gone. Remove stale references from drivers/staging/media/atomisp/pci and from the recommended Android kernel config. Fixes: e722a295cf49 ("staging: ion: remove from the tree") Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Hridya Valsaraju <hridya@google.com> Cc: Rob Herring <robh@kernel.org> Cc: linux-media@vger.kernel.org Cc: devel@driverdev.osuosl.org Signed-off-by: Matthias Maennich <maennich@google.com> --- .../media/atomisp/pci/atomisp_subdev.c | 20 ------------------- kernel/configs/android-recommended.config | 1 - 2 files changed, 21 deletions(-)