| Message ID | 1542273833-8546-1-git-send-email-ganeshgr@chelsio.com |
|---|---|
| State | Superseded, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net] cxgb4: fix thermal zone build error | expand |
Hello! On 15.11.2018 12:23, Ganesh Goudar wrote: > with CONFIG_THERMAL=m and cxgb4 as built-in build fails, and > 'commit e70a57fa59bb ("cxgb4: fix thermal configuration dependencies")' > tires to fix it but when cxgb4i is made built-in build fails again, Tries? :-) > use IS_REACHABLE instead of IS_ENABLED to fix the issue. > > Fixes: e70a57fa59bb (cxgb4: fix thermal configuration dependencies) > Reported-by: Randy Dunlap <rdunlap@infradead.org> > Signed-off-by: Ganesh Goudar <ganeshgr@chelsio.com> > --- > drivers/net/ethernet/chelsio/Kconfig | 1 - > drivers/net/ethernet/chelsio/cxgb4/Makefile | 4 +--- > drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 12 ++++++------ > 3 files changed, 7 insertions(+), 10 deletions(-) > > diff --git a/drivers/net/ethernet/chelsio/Kconfig b/drivers/net/ethernet/chelsio/Kconfig > index 75c1c5e..e2cdfa7 100644 > --- a/drivers/net/ethernet/chelsio/Kconfig > +++ b/drivers/net/ethernet/chelsio/Kconfig > @@ -67,7 +67,6 @@ config CHELSIO_T3 > config CHELSIO_T4 > tristate "Chelsio Communications T4/T5/T6 Ethernet support" > depends on PCI && (IPV6 || IPV6=n) > - depends on THERMAL || !THERMAL > select FW_LOADER > select MDIO > select ZLIB_DEFLATE > diff --git a/drivers/net/ethernet/chelsio/cxgb4/Makefile b/drivers/net/ethernet/chelsio/cxgb4/Makefile > index 78e5d17..91d8a88 100644 > --- a/drivers/net/ethernet/chelsio/cxgb4/Makefile > +++ b/drivers/net/ethernet/chelsio/cxgb4/Makefile > @@ -12,6 +12,4 @@ cxgb4-objs := cxgb4_main.o l2t.o smt.o t4_hw.o sge.o clip_tbl.o cxgb4_ethtool.o > cxgb4-$(CONFIG_CHELSIO_T4_DCB) += cxgb4_dcb.o > cxgb4-$(CONFIG_CHELSIO_T4_FCOE) += cxgb4_fcoe.o > cxgb4-$(CONFIG_DEBUG_FS) += cxgb4_debugfs.o > -ifdef CONFIG_THERMAL > -cxgb4-objs += cxgb4_thermal.o > -endif > +cxgb4-$(CONFIG_THERMAL) += cxgb4_thermal.o > diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c > index 05a4692..bd85210 100644 > --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c > +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c > @@ -5863,10 +5863,10 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent) > if (!is_t4(adapter->params.chip)) > cxgb4_ptp_init(adapter); > > - if (IS_ENABLED(CONFIG_THERMAL) && > - !is_t4(adapter->params.chip) && (adapter->flags & FW_OK)) > +#if IS_REACHABLE(CONFIG_THERMAL) Why use #ifdef amidst a function (if you can avoid it)? > + if (!is_t4(adapter->params.chip) && (adapter->flags & FW_OK)) > cxgb4_thermal_init(adapter); > - > +#endif > print_adapter_info(adapter); > return 0; > > @@ -5932,9 +5932,9 @@ static void remove_one(struct pci_dev *pdev) > > if (!is_t4(adapter->params.chip)) > cxgb4_ptp_stop(adapter); > - if (IS_ENABLED(CONFIG_THERMAL)) > - cxgb4_thermal_remove(adapter); > - > +#if IS_REACHABLE(CONFIG_THERMAL) > + cxgb4_thermal_remove(adapter); > +#endif Same question. [...] MBR, Sergei
diff --git a/drivers/net/ethernet/chelsio/Kconfig b/drivers/net/ethernet/chelsio/Kconfig index 75c1c5e..e2cdfa7 100644 --- a/drivers/net/ethernet/chelsio/Kconfig +++ b/drivers/net/ethernet/chelsio/Kconfig @@ -67,7 +67,6 @@ config CHELSIO_T3 config CHELSIO_T4 tristate "Chelsio Communications T4/T5/T6 Ethernet support" depends on PCI && (IPV6 || IPV6=n) - depends on THERMAL || !THERMAL select FW_LOADER select MDIO select ZLIB_DEFLATE diff --git a/drivers/net/ethernet/chelsio/cxgb4/Makefile b/drivers/net/ethernet/chelsio/cxgb4/Makefile index 78e5d17..91d8a88 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/Makefile +++ b/drivers/net/ethernet/chelsio/cxgb4/Makefile @@ -12,6 +12,4 @@ cxgb4-objs := cxgb4_main.o l2t.o smt.o t4_hw.o sge.o clip_tbl.o cxgb4_ethtool.o cxgb4-$(CONFIG_CHELSIO_T4_DCB) += cxgb4_dcb.o cxgb4-$(CONFIG_CHELSIO_T4_FCOE) += cxgb4_fcoe.o cxgb4-$(CONFIG_DEBUG_FS) += cxgb4_debugfs.o -ifdef CONFIG_THERMAL -cxgb4-objs += cxgb4_thermal.o -endif +cxgb4-$(CONFIG_THERMAL) += cxgb4_thermal.o diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c index 05a4692..bd85210 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c @@ -5863,10 +5863,10 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent) if (!is_t4(adapter->params.chip)) cxgb4_ptp_init(adapter); - if (IS_ENABLED(CONFIG_THERMAL) && - !is_t4(adapter->params.chip) && (adapter->flags & FW_OK)) +#if IS_REACHABLE(CONFIG_THERMAL) + if (!is_t4(adapter->params.chip) && (adapter->flags & FW_OK)) cxgb4_thermal_init(adapter); - +#endif print_adapter_info(adapter); return 0; @@ -5932,9 +5932,9 @@ static void remove_one(struct pci_dev *pdev) if (!is_t4(adapter->params.chip)) cxgb4_ptp_stop(adapter); - if (IS_ENABLED(CONFIG_THERMAL)) - cxgb4_thermal_remove(adapter); - +#if IS_REACHABLE(CONFIG_THERMAL) + cxgb4_thermal_remove(adapter); +#endif /* If we allocated filters, free up state associated with any * valid filters ... */
with CONFIG_THERMAL=m and cxgb4 as built-in build fails, and 'commit e70a57fa59bb ("cxgb4: fix thermal configuration dependencies")' tires to fix it but when cxgb4i is made built-in build fails again, use IS_REACHABLE instead of IS_ENABLED to fix the issue. Fixes: e70a57fa59bb (cxgb4: fix thermal configuration dependencies) Reported-by: Randy Dunlap <rdunlap@infradead.org> Signed-off-by: Ganesh Goudar <ganeshgr@chelsio.com> --- drivers/net/ethernet/chelsio/Kconfig | 1 - drivers/net/ethernet/chelsio/cxgb4/Makefile | 4 +--- drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 12 ++++++------ 3 files changed, 7 insertions(+), 10 deletions(-)