* [PATCH v2 net] ionic: fix ptp support config breakage
@ 2021-05-05 0:00 Shannon Nelson
2021-05-05 5:32 ` Leon Romanovsky
0 siblings, 1 reply; 4+ messages in thread
From: Shannon Nelson @ 2021-05-05 0:00 UTC (permalink / raw)
To: netdev, davem, kuba; +Cc: drivers, Shannon Nelson
Driver link failed with undefined references in some
kernel config variations.
v2 - added Fixes tag
Fixes: 61db421da31b ("ionic: link in the new hw timestamp code")
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Shannon Nelson <snelson@pensando.io>
---
drivers/net/ethernet/pensando/ionic/Makefile | 3 +--
drivers/net/ethernet/pensando/ionic/ionic_phc.c | 3 +++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/pensando/ionic/Makefile b/drivers/net/ethernet/pensando/ionic/Makefile
index 4e7642a2d25f..61c40169cb1f 100644
--- a/drivers/net/ethernet/pensando/ionic/Makefile
+++ b/drivers/net/ethernet/pensando/ionic/Makefile
@@ -5,5 +5,4 @@ obj-$(CONFIG_IONIC) := ionic.o
ionic-y := ionic_main.o ionic_bus_pci.o ionic_devlink.o ionic_dev.o \
ionic_debugfs.o ionic_lif.o ionic_rx_filter.o ionic_ethtool.o \
- ionic_txrx.o ionic_stats.o ionic_fw.o
-ionic-$(CONFIG_PTP_1588_CLOCK) += ionic_phc.o
+ ionic_txrx.o ionic_stats.o ionic_fw.o ionic_phc.o
diff --git a/drivers/net/ethernet/pensando/ionic/ionic_phc.c b/drivers/net/ethernet/pensando/ionic/ionic_phc.c
index a87c87e86aef..30c78808c45a 100644
--- a/drivers/net/ethernet/pensando/ionic/ionic_phc.c
+++ b/drivers/net/ethernet/pensando/ionic/ionic_phc.c
@@ -1,6 +1,8 @@
// SPDX-License-Identifier: GPL-2.0
/* Copyright(c) 2017 - 2021 Pensando Systems, Inc */
+#if IS_ENABLED(CONFIG_PTP_1588_CLOCK)
+
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
@@ -613,3 +615,4 @@ void ionic_lif_free_phc(struct ionic_lif *lif)
devm_kfree(lif->ionic->dev, lif->phc);
lif->phc = NULL;
}
+#endif /* IS_ENABLED(CONFIG_PTP_1588_CLOCK) */
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH v2 net] ionic: fix ptp support config breakage
2021-05-05 0:00 [PATCH v2 net] ionic: fix ptp support config breakage Shannon Nelson
@ 2021-05-05 5:32 ` Leon Romanovsky
2021-05-05 6:13 ` Randy Dunlap
0 siblings, 1 reply; 4+ messages in thread
From: Leon Romanovsky @ 2021-05-05 5:32 UTC (permalink / raw)
To: Shannon Nelson; +Cc: netdev, davem, kuba, drivers
On Tue, May 04, 2021 at 05:00:59PM -0700, Shannon Nelson wrote:
> Driver link failed with undefined references in some
> kernel config variations.
>
> v2 - added Fixes tag
Changelogs should be below "---" line.
We don't need them in commit message history.
>
> Fixes: 61db421da31b ("ionic: link in the new hw timestamp code")
> Reported-by: kernel test robot <lkp@intel.com>
> Signed-off-by: Shannon Nelson <snelson@pensando.io>
> ---
> drivers/net/ethernet/pensando/ionic/Makefile | 3 +--
> drivers/net/ethernet/pensando/ionic/ionic_phc.c | 3 +++
> 2 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/ethernet/pensando/ionic/Makefile b/drivers/net/ethernet/pensando/ionic/Makefile
> index 4e7642a2d25f..61c40169cb1f 100644
> --- a/drivers/net/ethernet/pensando/ionic/Makefile
> +++ b/drivers/net/ethernet/pensando/ionic/Makefile
> @@ -5,5 +5,4 @@ obj-$(CONFIG_IONIC) := ionic.o
>
> ionic-y := ionic_main.o ionic_bus_pci.o ionic_devlink.o ionic_dev.o \
> ionic_debugfs.o ionic_lif.o ionic_rx_filter.o ionic_ethtool.o \
> - ionic_txrx.o ionic_stats.o ionic_fw.o
> -ionic-$(CONFIG_PTP_1588_CLOCK) += ionic_phc.o
> + ionic_txrx.o ionic_stats.o ionic_fw.o ionic_phc.o
> diff --git a/drivers/net/ethernet/pensando/ionic/ionic_phc.c b/drivers/net/ethernet/pensando/ionic/ionic_phc.c
> index a87c87e86aef..30c78808c45a 100644
> --- a/drivers/net/ethernet/pensando/ionic/ionic_phc.c
> +++ b/drivers/net/ethernet/pensando/ionic/ionic_phc.c
> @@ -1,6 +1,8 @@
> // SPDX-License-Identifier: GPL-2.0
> /* Copyright(c) 2017 - 2021 Pensando Systems, Inc */
>
> +#if IS_ENABLED(CONFIG_PTP_1588_CLOCK)
I'm not sure, but think that IS_ENABLED() is intended to be used inside
functions/macros as boolean expression.
For other places like this, "#if CONFIG_PTP_1588_CLOCK" is better fit.
Thanks
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v2 net] ionic: fix ptp support config breakage
2021-05-05 5:32 ` Leon Romanovsky
@ 2021-05-05 6:13 ` Randy Dunlap
2021-05-05 6:27 ` Leon Romanovsky
0 siblings, 1 reply; 4+ messages in thread
From: Randy Dunlap @ 2021-05-05 6:13 UTC (permalink / raw)
To: Leon Romanovsky, Shannon Nelson; +Cc: netdev, davem, kuba, drivers
On 5/4/21 10:32 PM, Leon Romanovsky wrote:
> On Tue, May 04, 2021 at 05:00:59PM -0700, Shannon Nelson wrote:
>> Driver link failed with undefined references in some
>> kernel config variations.
>>
>> v2 - added Fixes tag
>
> Changelogs should be below "---" line.
> We don't need them in commit message history.
>
>>
>> Fixes: 61db421da31b ("ionic: link in the new hw timestamp code")
>> Reported-by: kernel test robot <lkp@intel.com>
>> Signed-off-by: Shannon Nelson <snelson@pensando.io>
>> ---
>> drivers/net/ethernet/pensando/ionic/Makefile | 3 +--
>> drivers/net/ethernet/pensando/ionic/ionic_phc.c | 3 +++
>> 2 files changed, 4 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/net/ethernet/pensando/ionic/Makefile b/drivers/net/ethernet/pensando/ionic/Makefile
>> index 4e7642a2d25f..61c40169cb1f 100644
>> --- a/drivers/net/ethernet/pensando/ionic/Makefile
>> +++ b/drivers/net/ethernet/pensando/ionic/Makefile
>> @@ -5,5 +5,4 @@ obj-$(CONFIG_IONIC) := ionic.o
>>
>> ionic-y := ionic_main.o ionic_bus_pci.o ionic_devlink.o ionic_dev.o \
>> ionic_debugfs.o ionic_lif.o ionic_rx_filter.o ionic_ethtool.o \
>> - ionic_txrx.o ionic_stats.o ionic_fw.o
>> -ionic-$(CONFIG_PTP_1588_CLOCK) += ionic_phc.o
>> + ionic_txrx.o ionic_stats.o ionic_fw.o ionic_phc.o
>> diff --git a/drivers/net/ethernet/pensando/ionic/ionic_phc.c b/drivers/net/ethernet/pensando/ionic/ionic_phc.c
>> index a87c87e86aef..30c78808c45a 100644
>> --- a/drivers/net/ethernet/pensando/ionic/ionic_phc.c
>> +++ b/drivers/net/ethernet/pensando/ionic/ionic_phc.c
>> @@ -1,6 +1,8 @@
>> // SPDX-License-Identifier: GPL-2.0
>> /* Copyright(c) 2017 - 2021 Pensando Systems, Inc */
>>
>> +#if IS_ENABLED(CONFIG_PTP_1588_CLOCK)
>
> I'm not sure, but think that IS_ENABLED() is intended to be used inside
> functions/macros as boolean expression.
>
> For other places like this, "#if CONFIG_PTP_1588_CLOCK" is better fit.
s/#if/#ifdef/
but the patch looks OK to me as is.
--
~Randy
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v2 net] ionic: fix ptp support config breakage
2021-05-05 6:13 ` Randy Dunlap
@ 2021-05-05 6:27 ` Leon Romanovsky
0 siblings, 0 replies; 4+ messages in thread
From: Leon Romanovsky @ 2021-05-05 6:27 UTC (permalink / raw)
To: Randy Dunlap; +Cc: Shannon Nelson, netdev, davem, kuba, drivers
On Tue, May 04, 2021 at 11:13:59PM -0700, Randy Dunlap wrote:
> On 5/4/21 10:32 PM, Leon Romanovsky wrote:
> > On Tue, May 04, 2021 at 05:00:59PM -0700, Shannon Nelson wrote:
> >> Driver link failed with undefined references in some
> >> kernel config variations.
> >>
> >> v2 - added Fixes tag
> >
> > Changelogs should be below "---" line.
> > We don't need them in commit message history.
> >
> >>
> >> Fixes: 61db421da31b ("ionic: link in the new hw timestamp code")
> >> Reported-by: kernel test robot <lkp@intel.com>
> >> Signed-off-by: Shannon Nelson <snelson@pensando.io>
> >> ---
> >> drivers/net/ethernet/pensando/ionic/Makefile | 3 +--
> >> drivers/net/ethernet/pensando/ionic/ionic_phc.c | 3 +++
> >> 2 files changed, 4 insertions(+), 2 deletions(-)
> >>
> >> diff --git a/drivers/net/ethernet/pensando/ionic/Makefile b/drivers/net/ethernet/pensando/ionic/Makefile
> >> index 4e7642a2d25f..61c40169cb1f 100644
> >> --- a/drivers/net/ethernet/pensando/ionic/Makefile
> >> +++ b/drivers/net/ethernet/pensando/ionic/Makefile
> >> @@ -5,5 +5,4 @@ obj-$(CONFIG_IONIC) := ionic.o
> >>
> >> ionic-y := ionic_main.o ionic_bus_pci.o ionic_devlink.o ionic_dev.o \
> >> ionic_debugfs.o ionic_lif.o ionic_rx_filter.o ionic_ethtool.o \
> >> - ionic_txrx.o ionic_stats.o ionic_fw.o
> >> -ionic-$(CONFIG_PTP_1588_CLOCK) += ionic_phc.o
> >> + ionic_txrx.o ionic_stats.o ionic_fw.o ionic_phc.o
> >> diff --git a/drivers/net/ethernet/pensando/ionic/ionic_phc.c b/drivers/net/ethernet/pensando/ionic/ionic_phc.c
> >> index a87c87e86aef..30c78808c45a 100644
> >> --- a/drivers/net/ethernet/pensando/ionic/ionic_phc.c
> >> +++ b/drivers/net/ethernet/pensando/ionic/ionic_phc.c
> >> @@ -1,6 +1,8 @@
> >> // SPDX-License-Identifier: GPL-2.0
> >> /* Copyright(c) 2017 - 2021 Pensando Systems, Inc */
> >>
> >> +#if IS_ENABLED(CONFIG_PTP_1588_CLOCK)
> >
> > I'm not sure, but think that IS_ENABLED() is intended to be used inside
> > functions/macros as boolean expression.
> >
> > For other places like this, "#if CONFIG_PTP_1588_CLOCK" is better fit.
>
> s/#if/#ifdef/
Sure, thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-05-05 6:27 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-05 0:00 [PATCH v2 net] ionic: fix ptp support config breakage Shannon Nelson
2021-05-05 5:32 ` Leon Romanovsky
2021-05-05 6:13 ` Randy Dunlap
2021-05-05 6:27 ` Leon Romanovsky
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).