• Arnd Bergmann's avatar
    net: lan743x: fix building without CONFIG_PTP_1588_CLOCK · 9dc502d7
    Arnd Bergmann authored
    Building without CONFIG_PTP_1588_CLOCK results in multiple failures,
    this was obviously not well tested:
    
    drivers/net/ethernet/microchip/lan743x_ptp.c: In function 'lan743x_ptp_isr':
    drivers/net/ethernet/microchip/lan743x_ptp.c:781:28: error: 'struct lan743x_ptp' has no member named 'ptp_clock'; did you mean 'tx_ts_lock'?
       ptp_schedule_worker(ptp->ptp_clock, 0);
                                ^~~~~~~~~
                                tx_ts_lock
    drivers/net/ethernet/microchip/lan743x_ptp.c: In function 'lan743x_ptp_open':
    drivers/net/ethernet/microchip/lan743x_ptp.c:879:6: error: unused variable 'ret' [-Werror=unused-variable]
      int ret = -ENODEV;
          ^~~
    At top level:
    drivers/net/ethernet/microchip/lan743x_ptp.c:63:13: error: 'lan743x_ptp_tx_ts_enqueue_ts' defined but not used [-Werror=unused-function]
     static void lan743x_ptp_tx_ts_enqueue_ts(struct lan743x_adapter *adapter,
                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
    cc1: all warnings being treated as errors
    drivers/net/ethernet/microchip/lan743x_ethtool.c: In function 'lan743x_ethtool_get_ts_info':
    drivers/net/ethernet/microchip/lan743x_ethtool.c:558:19: error: 'struct lan743x_ptp' has no member named 'ptp_clock'; did you mean 'tx_ts_lock'?
    
    Those #ifdef checks are hard to get right, replace them all with
    IS_ENABLED() checks that leave the same code visible to the compiler
    but let it optimize out the unused bits based on the configuration.
    
    Fixes: 07624df1 ("lan743x: lan743x: Add PTP support")
    Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
    Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    9dc502d7
lan743x_ptp.c 32 KB