| Message ID | 20191021164654.9642-3-mihail.atanassov@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/komeda: Improve IRQ error event prints | expand |
On Mon, Oct 21, 2019 at 04:47:19PM +0000, Mihail Atanassov wrote: > Now that there's a debugfs node to control the same, remove the > config option. > > Signed-off-by: Mihail Atanassov <mihail.atanassov@arm.com> > --- > drivers/gpu/drm/arm/display/Kconfig | 6 ------ > drivers/gpu/drm/arm/display/komeda/Makefile | 5 ++--- > drivers/gpu/drm/arm/display/komeda/komeda_dev.h | 6 ------ > 3 files changed, 2 insertions(+), 15 deletions(-) > > diff --git a/drivers/gpu/drm/arm/display/Kconfig b/drivers/gpu/drm/arm/display/Kconfig > index e87ff8623076..cec0639e3aa1 100644 > --- a/drivers/gpu/drm/arm/display/Kconfig > +++ b/drivers/gpu/drm/arm/display/Kconfig > @@ -12,9 +12,3 @@ config DRM_KOMEDA > Processor driver. It supports the D71 variants of the hardware. > > If compiled as a module it will be called komeda. > - > -config DRM_KOMEDA_ERROR_PRINT > - bool "Enable komeda error print" > - depends on DRM_KOMEDA > - help > - Choose this option to enable error printing. > diff --git a/drivers/gpu/drm/arm/display/komeda/Makefile b/drivers/gpu/drm/arm/display/komeda/Makefile > index f095a1c68ac7..1931a7fa1a14 100644 > --- a/drivers/gpu/drm/arm/display/komeda/Makefile > +++ b/drivers/gpu/drm/arm/display/komeda/Makefile > @@ -16,12 +16,11 @@ komeda-y := \ > komeda_crtc.o \ > komeda_plane.o \ > komeda_wb_connector.o \ > - komeda_private_obj.o > + komeda_private_obj.o \ > + komeda_event.o > > komeda-y += \ > d71/d71_dev.o \ > d71/d71_component.o > > -komeda-$(CONFIG_DRM_KOMEDA_ERROR_PRINT) += komeda_event.o > - > obj-$(CONFIG_DRM_KOMEDA) += komeda.o > diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_dev.h b/drivers/gpu/drm/arm/display/komeda/komeda_dev.h > index b5bd3d5898ee..831c375180f8 100644 > --- a/drivers/gpu/drm/arm/display/komeda/komeda_dev.h > +++ b/drivers/gpu/drm/arm/display/komeda/komeda_dev.h > @@ -226,13 +226,7 @@ void komeda_dev_destroy(struct komeda_dev *mdev); > > struct komeda_dev *dev_to_mdev(struct device *dev); > > -#ifdef CONFIG_DRM_KOMEDA_ERROR_PRINT > void komeda_print_events(struct komeda_events *evts, struct drm_device *dev); > -#else > -static inline void komeda_print_events(struct komeda_events *evts, > - struct drm_device *dev) > -{} > -#endif > Reviewed-by: James Qian Wang (Arm Technology China) <james.qian.wang@arm.com> > int komeda_dev_resume(struct komeda_dev *mdev); > int komeda_dev_suspend(struct komeda_dev *mdev);
diff --git a/drivers/gpu/drm/arm/display/Kconfig b/drivers/gpu/drm/arm/display/Kconfig index e87ff8623076..cec0639e3aa1 100644 --- a/drivers/gpu/drm/arm/display/Kconfig +++ b/drivers/gpu/drm/arm/display/Kconfig @@ -12,9 +12,3 @@ config DRM_KOMEDA Processor driver. It supports the D71 variants of the hardware. If compiled as a module it will be called komeda. - -config DRM_KOMEDA_ERROR_PRINT - bool "Enable komeda error print" - depends on DRM_KOMEDA - help - Choose this option to enable error printing. diff --git a/drivers/gpu/drm/arm/display/komeda/Makefile b/drivers/gpu/drm/arm/display/komeda/Makefile index f095a1c68ac7..1931a7fa1a14 100644 --- a/drivers/gpu/drm/arm/display/komeda/Makefile +++ b/drivers/gpu/drm/arm/display/komeda/Makefile @@ -16,12 +16,11 @@ komeda-y := \ komeda_crtc.o \ komeda_plane.o \ komeda_wb_connector.o \ - komeda_private_obj.o + komeda_private_obj.o \ + komeda_event.o komeda-y += \ d71/d71_dev.o \ d71/d71_component.o -komeda-$(CONFIG_DRM_KOMEDA_ERROR_PRINT) += komeda_event.o - obj-$(CONFIG_DRM_KOMEDA) += komeda.o diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_dev.h b/drivers/gpu/drm/arm/display/komeda/komeda_dev.h index b5bd3d5898ee..831c375180f8 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_dev.h +++ b/drivers/gpu/drm/arm/display/komeda/komeda_dev.h @@ -226,13 +226,7 @@ void komeda_dev_destroy(struct komeda_dev *mdev); struct komeda_dev *dev_to_mdev(struct device *dev); -#ifdef CONFIG_DRM_KOMEDA_ERROR_PRINT void komeda_print_events(struct komeda_events *evts, struct drm_device *dev); -#else -static inline void komeda_print_events(struct komeda_events *evts, - struct drm_device *dev) -{} -#endif int komeda_dev_resume(struct komeda_dev *mdev); int komeda_dev_suspend(struct komeda_dev *mdev);
Now that there's a debugfs node to control the same, remove the config option. Signed-off-by: Mihail Atanassov <mihail.atanassov@arm.com> --- drivers/gpu/drm/arm/display/Kconfig | 6 ------ drivers/gpu/drm/arm/display/komeda/Makefile | 5 ++--- drivers/gpu/drm/arm/display/komeda/komeda_dev.h | 6 ------ 3 files changed, 2 insertions(+), 15 deletions(-)