diff options
| author | Yangbo Lu <yangbo.lu@nxp.com> | 2017-06-19 10:46:04 (GMT) |
|---|---|---|
| committer | Xie Xiaobo <xiaobo.xie@nxp.com> | 2017-09-25 07:25:47 (GMT) |
| commit | 65d41b6a59ec1eaee84bb9502752569321d52102 (patch) | |
| tree | 5b11cab7d64e986a622dcff769738b6429031a9b /drivers/net/ethernet | |
| parent | b42133b24f37a41c284b3a5abe92ccaf247d6c11 (diff) | |
| download | linux-65d41b6a59ec1eaee84bb9502752569321d52102.tar.xz | |
dpaa_eth: move global variable 'clock' into ptp_priv_s struct
This patch is to move global variable 'clock' for DPAA PTP
clock pointer into ptp_priv_s struct.
Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
Diffstat (limited to 'drivers/net/ethernet')
| -rw-r--r-- | drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth.h | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/freescale/sdk_dpaa/dpaa_ptp.c | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth.h b/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth.h index eeb80c7..84d0afe 100644 --- a/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth.h +++ b/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth.h @@ -669,6 +669,7 @@ static inline void _dpa_assign_wq(struct dpa_fq *fq) struct ptp_priv_s { struct device_node *node; struct platform_device *of_dev; + struct ptp_clock *clock; struct mac_device *mac_dev; }; extern struct ptp_priv_s ptp_priv; diff --git a/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_ptp.c b/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_ptp.c index 7f12ba0..f54a3d6 100644 --- a/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_ptp.c +++ b/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_ptp.c @@ -27,8 +27,6 @@ #include "dpaa_eth.h" #include "mac.h" -struct ptp_clock *clock; - static struct mac_device *mac_dev; static u32 freqCompensation; @@ -256,6 +254,7 @@ static int __init __cold dpa_ptp_load(void) { struct device *ptp_dev; struct timespec64 now; + struct ptp_clock *clock = ptp_priv.clock; int dpa_phc_index; int err; @@ -283,6 +282,8 @@ module_init(dpa_ptp_load); static void __exit __cold dpa_ptp_unload(void) { + struct ptp_clock *clock = ptp_priv.clock; + if (mac_dev->fm_rtc_disable_interrupt) mac_dev->fm_rtc_disable_interrupt(mac_dev->fm_dev, 0xffffffff); ptp_clock_unregister(clock); |