Messages in this thread Patch in this message | | | From | Clay McClure <> | Subject | [PATCH] net: cpts: Condition WARN_ON on PTP_1588_CLOCK | Date | Thu, 16 Apr 2020 01:56:26 -0700 |
| |
CPTS_MOD merely implies PTP_1588_CLOCK; it is possible to build cpts without PTP clock support. In that case, ptp_clock_register() returns NULL and we should not WARN_ON(cpts->clock) when downing the interface. The ptp_*() functions are stubbed without PTP_1588_CLOCK, so it's safe to pass them a null pointer.
Signed-off-by: Clay McClure <clay@daemons.net> --- drivers/net/ethernet/ti/cpts.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/ti/cpts.c b/drivers/net/ethernet/ti/cpts.c index fd214f8730a9..daf4505f4a70 100644 --- a/drivers/net/ethernet/ti/cpts.c +++ b/drivers/net/ethernet/ti/cpts.c @@ -646,7 +646,7 @@ EXPORT_SYMBOL_GPL(cpts_register); void cpts_unregister(struct cpts *cpts) { - if (WARN_ON(!cpts->clock)) + if (IS_REACHABLE(PTP_1588_CLOCK) && WARN_ON(!cpts->clock)) return; ptp_clock_unregister(cpts->clock); -- 2.20.1
| |