FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-03-03 18:17:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

net: dpaa2: fix and improve dpaa2-ptp driver

Browse Source 
This patch is to fix and improve dpaa2-ptp driver
in some places.

- Fixed the return for some functions.
- Replaced kzalloc with devm_kzalloc.
- Removed dev_set_drvdata(dev, NULL).
- Made ptp_dpaa2_caps const.

Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Yangbo Lu 2018-10-08 15:44:30 +08:00 committed by David S. Miller
parent 15b49f360c
commit 590ac2ffde
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.c
View File

@ -46,7 +46,7 @@ static int ptp_dpaa2_adjfreq(struct ptp_clock_info *ptp, s32 ppb)
mc_dev->mc_handle, tmr_add); mc_dev->mc_handle, tmr_add);
if (err) if (err)
dev_err(dev, "dprtc_set_freq_compensation err %d\n", err); dev_err(dev, "dprtc_set_freq_compensation err %d\n", err);
return 0; return err;
} }
static int ptp_dpaa2_adjtime(struct ptp_clock_info *ptp, s64 delta) static int ptp_dpaa2_adjtime(struct ptp_clock_info *ptp, s64 delta)
@ -61,17 +61,15 @@ static int ptp_dpaa2_adjtime(struct ptp_clock_info *ptp, s64 delta)
err = dprtc_get_time(mc_dev->mc_io, 0, mc_dev->mc_handle, &now); err = dprtc_get_time(mc_dev->mc_io, 0, mc_dev->mc_handle, &now);
if (err) { if (err) {
dev_err(dev, "dprtc_get_time err %d\n", err); dev_err(dev, "dprtc_get_time err %d\n", err);
return 0; return err;
} }
now += delta; now += delta;
err = dprtc_set_time(mc_dev->mc_io, 0, mc_dev->mc_handle, now); err = dprtc_set_time(mc_dev->mc_io, 0, mc_dev->mc_handle, now);
if (err) { if (err)
dev_err(dev, "dprtc_set_time err %d\n", err); dev_err(dev, "dprtc_set_time err %d\n", err);
return 0; return err;
}
return 0;
} }
static int ptp_dpaa2_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts) static int ptp_dpaa2_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts)
@ -87,12 +85,12 @@ static int ptp_dpaa2_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts)
err = dprtc_get_time(mc_dev->mc_io, 0, mc_dev->mc_handle, &ns); err = dprtc_get_time(mc_dev->mc_io, 0, mc_dev->mc_handle, &ns);
if (err) { if (err) {
dev_err(dev, "dprtc_get_time err %d\n", err); dev_err(dev, "dprtc_get_time err %d\n", err);
return 0; return err;
} }
ts->tv_sec = div_u64_rem(ns, 1000000000, &remainder); ts->tv_sec = div_u64_rem(ns, 1000000000, &remainder);
ts->tv_nsec = remainder; ts->tv_nsec = remainder;
return 0; return err;
} }
static int ptp_dpaa2_settime(struct ptp_clock_info *ptp, static int ptp_dpaa2_settime(struct ptp_clock_info *ptp,
@ -111,10 +109,10 @@ static int ptp_dpaa2_settime(struct ptp_clock_info *ptp,
err = dprtc_set_time(mc_dev->mc_io, 0, mc_dev->mc_handle, ns); err = dprtc_set_time(mc_dev->mc_io, 0, mc_dev->mc_handle, ns);
if (err) if (err)
dev_err(dev, "dprtc_set_time err %d\n", err); dev_err(dev, "dprtc_set_time err %d\n", err);
return 0; return err;
} }
static struct ptp_clock_info ptp_dpaa2_caps = { static const struct ptp_clock_info ptp_dpaa2_caps = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "DPAA2 PTP Clock", .name = "DPAA2 PTP Clock",
.max_adj = 512000, .max_adj = 512000,
@ -136,7 +134,7 @@ static int dpaa2_ptp_probe(struct fsl_mc_device *mc_dev)
u32 tmr_add = 0; u32 tmr_add = 0;
int err; int err;
ptp_dpaa2 = kzalloc(sizeof(*ptp_dpaa2), GFP_KERNEL); ptp_dpaa2 = devm_kzalloc(dev, sizeof(*ptp_dpaa2), GFP_KERNEL);
if (!ptp_dpaa2) if (!ptp_dpaa2)
return -ENOMEM; return -ENOMEM;
@ -182,8 +180,6 @@ err_close:
err_free_mcp: err_free_mcp:
fsl_mc_portal_free(mc_dev->mc_io); fsl_mc_portal_free(mc_dev->mc_io);
err_exit: err_exit:
kfree(ptp_dpaa2);
dev_set_drvdata(dev, NULL);
return err; return err;
} }
@ -198,9 +194,6 @@ static int dpaa2_ptp_remove(struct fsl_mc_device *mc_dev)
dprtc_close(mc_dev->mc_io, 0, mc_dev->mc_handle); dprtc_close(mc_dev->mc_io, 0, mc_dev->mc_handle);
fsl_mc_portal_free(mc_dev->mc_io); fsl_mc_portal_free(mc_dev->mc_io);
kfree(ptp_dpaa2);
dev_set_drvdata(dev, NULL);
return 0; return 0;
} }