diff options
author | Petr Mladek <pmladek@suse.com> | 2019-05-06 10:33:10 +0200 |
---|---|---|
committer | Petr Mladek <pmladek@suse.com> | 2019-05-06 10:33:10 +0200 |
commit | 0f46c78391e1348fe45af86a0cd52795726695af (patch) | |
tree | ee841bfa1178ce5be421c79bed73bb5e72b6d38e /drivers/nvdimm | |
parent | Merge branch 'for-5.2-vsprintf-hardening' into for-linus (diff) | |
parent | treewide: Switch printk users from %pf and %pF to %ps and %pS, respectively (diff) | |
download | linux-dev-0f46c78391e1348fe45af86a0cd52795726695af.tar.xz linux-dev-0f46c78391e1348fe45af86a0cd52795726695af.zip |
Merge branch 'for-5.2-pf-removal' into for-linus
Diffstat (limited to 'drivers/nvdimm')
-rw-r--r-- | drivers/nvdimm/bus.c | 2 | ||||
-rw-r--r-- | drivers/nvdimm/dimm_devs.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/nvdimm/bus.c b/drivers/nvdimm/bus.c index 7bbff0af29b2..7ff684159f29 100644 --- a/drivers/nvdimm/bus.c +++ b/drivers/nvdimm/bus.c @@ -581,7 +581,7 @@ int __nd_driver_register(struct nd_device_driver *nd_drv, struct module *owner, struct device_driver *drv = &nd_drv->drv; if (!nd_drv->type) { - pr_debug("driver type bitmask not set (%pf)\n", + pr_debug("driver type bitmask not set (%ps)\n", __builtin_return_address(0)); return -EINVAL; } diff --git a/drivers/nvdimm/dimm_devs.c b/drivers/nvdimm/dimm_devs.c index efe412a6b5b9..06f5087547ea 100644 --- a/drivers/nvdimm/dimm_devs.c +++ b/drivers/nvdimm/dimm_devs.c @@ -53,7 +53,7 @@ static int validate_dimm(struct nvdimm_drvdata *ndd) rc = nvdimm_check_config_data(ndd->dev); if (rc) - dev_dbg(ndd->dev, "%pf: %s error: %d\n", + dev_dbg(ndd->dev, "%ps: %s error: %d\n", __builtin_return_address(0), __func__, rc); return rc; } |