Message ID | 20240606120842.1377267-1-pengfuyuan@kylinos.cn (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | arm/komeda: Remove all CONFIG_DEBUG_FS conditional compilations | expand |
On Thu, Jun 06, 2024 at 08:08:42PM +0800, pengfuyuan wrote: > Since the debugfs functions have no-op stubs for CONFIG_DEBUG_FS=n, > the compiler will optimize the rest away since they are no longer referenced. > > The benefit of removing the conditional compilation is that the build > is actually tested for both CONFIG_DEBUG_FS configuration values. > Assuming most developers have it enabled, CONFIG_DEBUG_FS=n is not tested > much and may fail the build due to the conditional compilation. > > Reported-by: k2ci <kernel-bot@kylinos.cn> > Signed-off-by: pengfuyuan <pengfuyuan@kylinos.cn> Acked-by: Liviu Dudau <liviu.dudau@arm.com> Thanks for the cleanup! Best regards, Liviu > --- > drivers/gpu/drm/arm/display/komeda/komeda_dev.c | 8 -------- > 1 file changed, 8 deletions(-) > > diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_dev.c b/drivers/gpu/drm/arm/display/komeda/komeda_dev.c > index 14ee79becacb..5ba62e637a61 100644 > --- a/drivers/gpu/drm/arm/display/komeda/komeda_dev.c > +++ b/drivers/gpu/drm/arm/display/komeda/komeda_dev.c > @@ -12,10 +12,8 @@ > #include <linux/platform_device.h> > #include <linux/pm_runtime.h> > #include <linux/dma-mapping.h> > -#ifdef CONFIG_DEBUG_FS > #include <linux/debugfs.h> > #include <linux/seq_file.h> > -#endif > > #include <drm/drm_print.h> > > @@ -43,7 +41,6 @@ static int komeda_register_show(struct seq_file *sf, void *x) > > DEFINE_SHOW_ATTRIBUTE(komeda_register); > > -#ifdef CONFIG_DEBUG_FS > static void komeda_debugfs_init(struct komeda_dev *mdev) > { > if (!debugfs_initialized()) > @@ -55,7 +52,6 @@ static void komeda_debugfs_init(struct komeda_dev *mdev) > debugfs_create_x16("err_verbosity", 0664, mdev->debugfs_root, > &mdev->err_verbosity); > } > -#endif > > static ssize_t > core_id_show(struct device *dev, struct device_attribute *attr, char *buf) > @@ -265,9 +261,7 @@ struct komeda_dev *komeda_dev_create(struct device *dev) > > mdev->err_verbosity = KOMEDA_DEV_PRINT_ERR_EVENTS; > > -#ifdef CONFIG_DEBUG_FS > komeda_debugfs_init(mdev); > -#endif > > return mdev; > > @@ -286,9 +280,7 @@ void komeda_dev_destroy(struct komeda_dev *mdev) > > sysfs_remove_group(&dev->kobj, &komeda_sysfs_attr_group); > > -#ifdef CONFIG_DEBUG_FS > debugfs_remove_recursive(mdev->debugfs_root); > -#endif > > if (mdev->aclk) > clk_prepare_enable(mdev->aclk); > -- > 2.25.1 >
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_dev.c b/drivers/gpu/drm/arm/display/komeda/komeda_dev.c index 14ee79becacb..5ba62e637a61 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_dev.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_dev.c @@ -12,10 +12,8 @@ #include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/dma-mapping.h> -#ifdef CONFIG_DEBUG_FS #include <linux/debugfs.h> #include <linux/seq_file.h> -#endif #include <drm/drm_print.h> @@ -43,7 +41,6 @@ static int komeda_register_show(struct seq_file *sf, void *x) DEFINE_SHOW_ATTRIBUTE(komeda_register); -#ifdef CONFIG_DEBUG_FS static void komeda_debugfs_init(struct komeda_dev *mdev) { if (!debugfs_initialized()) @@ -55,7 +52,6 @@ static void komeda_debugfs_init(struct komeda_dev *mdev) debugfs_create_x16("err_verbosity", 0664, mdev->debugfs_root, &mdev->err_verbosity); } -#endif static ssize_t core_id_show(struct device *dev, struct device_attribute *attr, char *buf) @@ -265,9 +261,7 @@ struct komeda_dev *komeda_dev_create(struct device *dev) mdev->err_verbosity = KOMEDA_DEV_PRINT_ERR_EVENTS; -#ifdef CONFIG_DEBUG_FS komeda_debugfs_init(mdev); -#endif return mdev; @@ -286,9 +280,7 @@ void komeda_dev_destroy(struct komeda_dev *mdev) sysfs_remove_group(&dev->kobj, &komeda_sysfs_attr_group); -#ifdef CONFIG_DEBUG_FS debugfs_remove_recursive(mdev->debugfs_root); -#endif if (mdev->aclk) clk_prepare_enable(mdev->aclk);
Since the debugfs functions have no-op stubs for CONFIG_DEBUG_FS=n, the compiler will optimize the rest away since they are no longer referenced. The benefit of removing the conditional compilation is that the build is actually tested for both CONFIG_DEBUG_FS configuration values. Assuming most developers have it enabled, CONFIG_DEBUG_FS=n is not tested much and may fail the build due to the conditional compilation. Reported-by: k2ci <kernel-bot@kylinos.cn> Signed-off-by: pengfuyuan <pengfuyuan@kylinos.cn> --- drivers/gpu/drm/arm/display/komeda/komeda_dev.c | 8 -------- 1 file changed, 8 deletions(-)