| Message ID | 20220730144833.0a0d9825@endymion.delvare (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] soc: mediatek: Let PMIC Wrapper and SCPSYS depend on OF | expand |
On 30/07/2022 14:48, Jean Delvare wrote: > With the following configuration options: > CONFIG_OF is not set > CONFIG_MTK_PMIC_WRAP=y > CONFIG_MTK_SCPSYS=y > we get the following build warnings: > > CC drivers/soc/mediatek/mtk-pmic-wrap.o > drivers/soc/mediatek/mtk-pmic-wrap.c:2138:34: warning: ‘of_pwrap_match_tbl’ defined but not used [-Wunused-const-variable=] > drivers/soc/mediatek/mtk-pmic-wrap.c:1953:34: warning: ‘of_slave_match_tbl’ defined but not used [-Wunused-const-variable=] > CC drivers/soc/mediatek/mtk-scpsys.o > drivers/soc/mediatek/mtk-scpsys.c:1084:34: warning: ‘of_scpsys_match_tbl’ defined but not used [-Wunused-const-variable=] > > Looking at the code, both drivers can only bind to OF-defined device > nodes, so these drivers are useless without OF and should therefore > depend on it. > > Also drop of_match_ptr() from both drivers. We already know what it > will resolve to, so we might as well save cpp some work. > > Developers or QA teams who wish to test-build the code can still do > so by enabling CONFIG_OF, which is available on all architectures and > has no dependencies. > > Signed-off-by: Jean Delvare <jdelvare@suse.de> > Reported-by: kernel test robot <lkp@intel.com> > Link: https://lore.kernel.org/all/202207240252.ZY5hSCNB-lkp@intel.com/ > Cc: Matthias Brugger <matthias.bgg@gmail.com> > Cc: Chenglin Xu <chenglin.xu@mediatek.com> Applied, thanks! > --- > Changes since v1: > * Drop of_match_ptr() (suggested by AngeloGioacchino Del Regno > > drivers/soc/mediatek/Kconfig | 2 ++ > drivers/soc/mediatek/mtk-pmic-wrap.c | 2 +- > drivers/soc/mediatek/mtk-scpsys.c | 2 +- > 3 files changed, 4 insertions(+), 2 deletions(-) > > --- linux-5.18.orig/drivers/soc/mediatek/Kconfig 2022-07-28 11:22:23.098393325 +0200 > +++ linux-5.18/drivers/soc/mediatek/Kconfig 2022-07-28 11:23:58.635687065 +0200 > @@ -37,6 +37,7 @@ config MTK_INFRACFG > config MTK_PMIC_WRAP > tristate "MediaTek PMIC Wrapper Support" > depends on RESET_CONTROLLER > + depends on OF > select REGMAP > help > Say yes here to add support for MediaTek PMIC Wrapper found > @@ -46,6 +47,7 @@ config MTK_PMIC_WRAP > config MTK_SCPSYS > bool "MediaTek SCPSYS Support" > default ARCH_MEDIATEK > + depends on OF > select REGMAP > select MTK_INFRACFG > select PM_GENERIC_DOMAINS if PM > --- linux-5.18.orig/drivers/soc/mediatek/mtk-pmic-wrap.c 2022-07-30 11:20:22.221919946 +0200 > +++ linux-5.18/drivers/soc/mediatek/mtk-pmic-wrap.c 2022-07-30 11:41:14.073038643 +0200 > @@ -2347,7 +2347,7 @@ static int pwrap_probe(struct platform_d > static struct platform_driver pwrap_drv = { > .driver = { > .name = "mt-pmic-pwrap", > - .of_match_table = of_match_ptr(of_pwrap_match_tbl), > + .of_match_table = of_pwrap_match_tbl, > }, > .probe = pwrap_probe, > }; > --- linux-5.18.orig/drivers/soc/mediatek/mtk-scpsys.c 2022-07-30 11:20:22.221919946 +0200 > +++ linux-5.18/drivers/soc/mediatek/mtk-scpsys.c 2022-07-30 11:41:22.466154796 +0200 > @@ -1141,7 +1141,7 @@ static struct platform_driver scpsys_drv > .name = "mtk-scpsys", > .suppress_bind_attrs = true, > .owner = THIS_MODULE, > - .of_match_table = of_match_ptr(of_scpsys_match_tbl), > + .of_match_table = of_scpsys_match_tbl, > }, > }; > builtin_platform_driver(scpsys_drv); >
--- linux-5.18.orig/drivers/soc/mediatek/Kconfig 2022-07-28 11:22:23.098393325 +0200 +++ linux-5.18/drivers/soc/mediatek/Kconfig 2022-07-28 11:23:58.635687065 +0200 @@ -37,6 +37,7 @@ config MTK_INFRACFG config MTK_PMIC_WRAP tristate "MediaTek PMIC Wrapper Support" depends on RESET_CONTROLLER + depends on OF select REGMAP help Say yes here to add support for MediaTek PMIC Wrapper found @@ -46,6 +47,7 @@ config MTK_PMIC_WRAP config MTK_SCPSYS bool "MediaTek SCPSYS Support" default ARCH_MEDIATEK + depends on OF select REGMAP select MTK_INFRACFG select PM_GENERIC_DOMAINS if PM --- linux-5.18.orig/drivers/soc/mediatek/mtk-pmic-wrap.c 2022-07-30 11:20:22.221919946 +0200 +++ linux-5.18/drivers/soc/mediatek/mtk-pmic-wrap.c 2022-07-30 11:41:14.073038643 +0200 @@ -2347,7 +2347,7 @@ static int pwrap_probe(struct platform_d static struct platform_driver pwrap_drv = { .driver = { .name = "mt-pmic-pwrap", - .of_match_table = of_match_ptr(of_pwrap_match_tbl), + .of_match_table = of_pwrap_match_tbl, }, .probe = pwrap_probe, }; --- linux-5.18.orig/drivers/soc/mediatek/mtk-scpsys.c 2022-07-30 11:20:22.221919946 +0200 +++ linux-5.18/drivers/soc/mediatek/mtk-scpsys.c 2022-07-30 11:41:22.466154796 +0200 @@ -1141,7 +1141,7 @@ static struct platform_driver scpsys_drv .name = "mtk-scpsys", .suppress_bind_attrs = true, .owner = THIS_MODULE, - .of_match_table = of_match_ptr(of_scpsys_match_tbl), + .of_match_table = of_scpsys_match_tbl, }, }; builtin_platform_driver(scpsys_drv);
With the following configuration options: CONFIG_OF is not set CONFIG_MTK_PMIC_WRAP=y CONFIG_MTK_SCPSYS=y we get the following build warnings: CC drivers/soc/mediatek/mtk-pmic-wrap.o drivers/soc/mediatek/mtk-pmic-wrap.c:2138:34: warning: ‘of_pwrap_match_tbl’ defined but not used [-Wunused-const-variable=] drivers/soc/mediatek/mtk-pmic-wrap.c:1953:34: warning: ‘of_slave_match_tbl’ defined but not used [-Wunused-const-variable=] CC drivers/soc/mediatek/mtk-scpsys.o drivers/soc/mediatek/mtk-scpsys.c:1084:34: warning: ‘of_scpsys_match_tbl’ defined but not used [-Wunused-const-variable=] Looking at the code, both drivers can only bind to OF-defined device nodes, so these drivers are useless without OF and should therefore depend on it. Also drop of_match_ptr() from both drivers. We already know what it will resolve to, so we might as well save cpp some work. Developers or QA teams who wish to test-build the code can still do so by enabling CONFIG_OF, which is available on all architectures and has no dependencies. Signed-off-by: Jean Delvare <jdelvare@suse.de> Reported-by: kernel test robot <lkp@intel.com> Link: https://lore.kernel.org/all/202207240252.ZY5hSCNB-lkp@intel.com/ Cc: Matthias Brugger <matthias.bgg@gmail.com> Cc: Chenglin Xu <chenglin.xu@mediatek.com> --- Changes since v1: * Drop of_match_ptr() (suggested by AngeloGioacchino Del Regno drivers/soc/mediatek/Kconfig | 2 ++ drivers/soc/mediatek/mtk-pmic-wrap.c | 2 +- drivers/soc/mediatek/mtk-scpsys.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-)