diff options
| author | Yangbo Lu <yangbo.lu@nxp.com> | 2018-10-08 03:44:28 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-10-08 13:23:22 -0400 |
| commit | 180f539d751a7a96da3f266e5dc8d167df77e3fa (patch) | |
| tree | 841af3b5e9afeb7f658c3c13da8cfff3b807c927 /drivers/net/ethernet/freescale/dpaa2 | |
| parent | 58b1e729b33acc558f2abb9e1e0178f060685c57 (diff) | |
net: dpaa2: rename rtc as ptp in dpaa2-ptp driver
In dpaa2-ptp driver, it's odd to use rtc in names of
some functions and structures except these dprtc APIs.
This patch is to use ptp instead of rtc in names.
Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/freescale/dpaa2')
| -rw-r--r-- | drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.c index 2e90d5a3d920..c73eef275a99 100644 --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.c +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.c | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | #include "dpaa2-ptp.h" | 12 | #include "dpaa2-ptp.h" |
| 13 | 13 | ||
| 14 | struct ptp_dpaa2_priv { | 14 | struct ptp_dpaa2_priv { |
| 15 | struct fsl_mc_device *rtc_mc_dev; | 15 | struct fsl_mc_device *ptp_mc_dev; |
| 16 | struct ptp_clock *clock; | 16 | struct ptp_clock *clock; |
| 17 | struct ptp_clock_info caps; | 17 | struct ptp_clock_info caps; |
| 18 | u32 freq_comp; | 18 | u32 freq_comp; |
| @@ -23,7 +23,7 @@ static int ptp_dpaa2_adjfreq(struct ptp_clock_info *ptp, s32 ppb) | |||
| 23 | { | 23 | { |
| 24 | struct ptp_dpaa2_priv *ptp_dpaa2 = | 24 | struct ptp_dpaa2_priv *ptp_dpaa2 = |
| 25 | container_of(ptp, struct ptp_dpaa2_priv, caps); | 25 | container_of(ptp, struct ptp_dpaa2_priv, caps); |
| 26 | struct fsl_mc_device *mc_dev = ptp_dpaa2->rtc_mc_dev; | 26 | struct fsl_mc_device *mc_dev = ptp_dpaa2->ptp_mc_dev; |
| 27 | struct device *dev = &mc_dev->dev; | 27 | struct device *dev = &mc_dev->dev; |
| 28 | u64 adj; | 28 | u64 adj; |
| 29 | u32 diff, tmr_add; | 29 | u32 diff, tmr_add; |
| @@ -53,7 +53,7 @@ static int ptp_dpaa2_adjtime(struct ptp_clock_info *ptp, s64 delta) | |||
| 53 | { | 53 | { |
| 54 | struct ptp_dpaa2_priv *ptp_dpaa2 = | 54 | struct ptp_dpaa2_priv *ptp_dpaa2 = |
| 55 | container_of(ptp, struct ptp_dpaa2_priv, caps); | 55 | container_of(ptp, struct ptp_dpaa2_priv, caps); |
| 56 | struct fsl_mc_device *mc_dev = ptp_dpaa2->rtc_mc_dev; | 56 | struct fsl_mc_device *mc_dev = ptp_dpaa2->ptp_mc_dev; |
| 57 | struct device *dev = &mc_dev->dev; | 57 | struct device *dev = &mc_dev->dev; |
| 58 | s64 now; | 58 | s64 now; |
| 59 | int err = 0; | 59 | int err = 0; |
| @@ -78,7 +78,7 @@ static int ptp_dpaa2_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts) | |||
| 78 | { | 78 | { |
| 79 | struct ptp_dpaa2_priv *ptp_dpaa2 = | 79 | struct ptp_dpaa2_priv *ptp_dpaa2 = |
| 80 | container_of(ptp, struct ptp_dpaa2_priv, caps); | 80 | container_of(ptp, struct ptp_dpaa2_priv, caps); |
| 81 | struct fsl_mc_device *mc_dev = ptp_dpaa2->rtc_mc_dev; | 81 | struct fsl_mc_device *mc_dev = ptp_dpaa2->ptp_mc_dev; |
| 82 | struct device *dev = &mc_dev->dev; | 82 | struct device *dev = &mc_dev->dev; |
| 83 | u64 ns; | 83 | u64 ns; |
| 84 | u32 remainder; | 84 | u32 remainder; |
| @@ -100,7 +100,7 @@ static int ptp_dpaa2_settime(struct ptp_clock_info *ptp, | |||
| 100 | { | 100 | { |
| 101 | struct ptp_dpaa2_priv *ptp_dpaa2 = | 101 | struct ptp_dpaa2_priv *ptp_dpaa2 = |
| 102 | container_of(ptp, struct ptp_dpaa2_priv, caps); | 102 | container_of(ptp, struct ptp_dpaa2_priv, caps); |
| 103 | struct fsl_mc_device *mc_dev = ptp_dpaa2->rtc_mc_dev; | 103 | struct fsl_mc_device *mc_dev = ptp_dpaa2->ptp_mc_dev; |
| 104 | struct device *dev = &mc_dev->dev; | 104 | struct device *dev = &mc_dev->dev; |
| 105 | u64 ns; | 105 | u64 ns; |
| 106 | int err = 0; | 106 | int err = 0; |
| @@ -129,7 +129,7 @@ static struct ptp_clock_info ptp_dpaa2_caps = { | |||
| 129 | .settime64 = ptp_dpaa2_settime, | 129 | .settime64 = ptp_dpaa2_settime, |
| 130 | }; | 130 | }; |
| 131 | 131 | ||
| 132 | static int rtc_probe(struct fsl_mc_device *mc_dev) | 132 | static int dpaa2_ptp_probe(struct fsl_mc_device *mc_dev) |
| 133 | { | 133 | { |
| 134 | struct device *dev = &mc_dev->dev; | 134 | struct device *dev = &mc_dev->dev; |
| 135 | struct ptp_dpaa2_priv *ptp_dpaa2; | 135 | struct ptp_dpaa2_priv *ptp_dpaa2; |
| @@ -153,7 +153,7 @@ static int rtc_probe(struct fsl_mc_device *mc_dev) | |||
| 153 | goto err_free_mcp; | 153 | goto err_free_mcp; |
| 154 | } | 154 | } |
| 155 | 155 | ||
| 156 | ptp_dpaa2->rtc_mc_dev = mc_dev; | 156 | ptp_dpaa2->ptp_mc_dev = mc_dev; |
| 157 | 157 | ||
| 158 | err = dprtc_get_freq_compensation(mc_dev->mc_io, 0, | 158 | err = dprtc_get_freq_compensation(mc_dev->mc_io, 0, |
| 159 | mc_dev->mc_handle, &tmr_add); | 159 | mc_dev->mc_handle, &tmr_add); |
| @@ -187,7 +187,7 @@ err_exit: | |||
| 187 | return err; | 187 | return err; |
| 188 | } | 188 | } |
| 189 | 189 | ||
| 190 | static int rtc_remove(struct fsl_mc_device *mc_dev) | 190 | static int dpaa2_ptp_remove(struct fsl_mc_device *mc_dev) |
| 191 | { | 191 | { |
| 192 | struct ptp_dpaa2_priv *ptp_dpaa2; | 192 | struct ptp_dpaa2_priv *ptp_dpaa2; |
| 193 | struct device *dev = &mc_dev->dev; | 193 | struct device *dev = &mc_dev->dev; |
| @@ -204,26 +204,26 @@ static int rtc_remove(struct fsl_mc_device *mc_dev) | |||
| 204 | return 0; | 204 | return 0; |
| 205 | } | 205 | } |
| 206 | 206 | ||
| 207 | static const struct fsl_mc_device_id rtc_match_id_table[] = { | 207 | static const struct fsl_mc_device_id dpaa2_ptp_match_id_table[] = { |
| 208 | { | 208 | { |
| 209 | .vendor = FSL_MC_VENDOR_FREESCALE, | 209 | .vendor = FSL_MC_VENDOR_FREESCALE, |
| 210 | .obj_type = "dprtc", | 210 | .obj_type = "dprtc", |
| 211 | }, | 211 | }, |
| 212 | {} | 212 | {} |
| 213 | }; | 213 | }; |
| 214 | MODULE_DEVICE_TABLE(fslmc, rtc_match_id_table); | 214 | MODULE_DEVICE_TABLE(fslmc, dpaa2_ptp_match_id_table); |
| 215 | 215 | ||
| 216 | static struct fsl_mc_driver rtc_drv = { | 216 | static struct fsl_mc_driver dpaa2_ptp_drv = { |
| 217 | .driver = { | 217 | .driver = { |
| 218 | .name = KBUILD_MODNAME, | 218 | .name = KBUILD_MODNAME, |
| 219 | .owner = THIS_MODULE, | 219 | .owner = THIS_MODULE, |
| 220 | }, | 220 | }, |
| 221 | .probe = rtc_probe, | 221 | .probe = dpaa2_ptp_probe, |
| 222 | .remove = rtc_remove, | 222 | .remove = dpaa2_ptp_remove, |
| 223 | .match_id_table = rtc_match_id_table, | 223 | .match_id_table = dpaa2_ptp_match_id_table, |
| 224 | }; | 224 | }; |
| 225 | 225 | ||
| 226 | module_fsl_mc_driver(rtc_drv); | 226 | module_fsl_mc_driver(dpaa2_ptp_drv); |
| 227 | 227 | ||
| 228 | MODULE_LICENSE("GPL v2"); | 228 | MODULE_LICENSE("GPL v2"); |
| 229 | MODULE_DESCRIPTION("DPAA2 PTP Clock Driver"); | 229 | MODULE_DESCRIPTION("DPAA2 PTP Clock Driver"); |
