diff options
author | David S. Miller <davem@davemloft.net> | 2020-09-18 17:53:05 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2020-09-18 17:53:05 -0700 |
commit | 0db0561d13df07978bea63a19f644fc16a60f54a (patch) | |
tree | 5666cdb4f4dcf0eb35282967470e2d9f6eaf1fc4 /drivers/net/ethernet/mscc/ocelot_ptp.c | |
parent | 42ccf1cd6aa5bb6fba7a2bfeb08c88d822e05916 (diff) | |
parent | d60bc62de4ae068ed4b215c24cdfdd5035aa986e (diff) |
Merge branch 'Felix-DSA-driver-cleanup-build-Seville-separately'
Vladimir Oltean says:
====================
Felix DSA driver cleanup: build Seville separately
When introducing the Seville switch support to the Felix driver, some
technical debt was created. Since both VSC9959 and VSC9953 are embedded
switches (one on an arm64 SoC and the other on a powerpc SoC), there is
no use case for having the code for both be present in the same module.
This was necessary at the time due to the common SERDES PCS code that
they were using, but that has been since refactored into
drivers/net/pcs/pcs-lynx.c.
This makes the Seville driver stop uselessly depending upon PCI and
FSL_ENETC_MDIO, which were only dependencies of Felix in fact.
Some whitespace/tab conversions are also present in this series as part
of the cleanup process.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mscc/ocelot_ptp.c')
-rw-r--r-- | drivers/net/ethernet/mscc/ocelot_ptp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mscc/ocelot_ptp.c b/drivers/net/ethernet/mscc/ocelot_ptp.c index 1e08fe4daaef..a33ab315cc6b 100644 --- a/drivers/net/ethernet/mscc/ocelot_ptp.c +++ b/drivers/net/ethernet/mscc/ocelot_ptp.c @@ -300,7 +300,8 @@ int ocelot_ptp_enable(struct ptp_clock_info *ptp, } EXPORT_SYMBOL(ocelot_ptp_enable); -int ocelot_init_timestamp(struct ocelot *ocelot, struct ptp_clock_info *info) +int ocelot_init_timestamp(struct ocelot *ocelot, + const struct ptp_clock_info *info) { struct ptp_clock *ptp_clock; int i; |