blob: 617d3e531324c55b6997cbbc675903157294313d (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
|
From bbb23c33bbfc0fdb6098f0c61950f4a7c03379aa Mon Sep 17 00:00:00 2001
From: Yangbo Lu <yangbo.lu@nxp.com>
Date: Mon, 19 Jun 2017 18:46:04 +0800
Subject: [PATCH] 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>
---
drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth.h | 1 +
drivers/net/ethernet/freescale/sdk_dpaa/dpaa_ptp.c | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
--- 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
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;
--- 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(vo
{
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);
|
