diff options
author | Michael Neuling <mikey@neuling.org> | 2015-05-27 02:07:09 -0400 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2015-06-02 23:27:18 -0400 |
commit | b12994fbfe9362e3b5ed9f360d3cd6fb34d6645a (patch) | |
tree | e2c9d1a7e755a0de3509e467beec43fcbdc1dce5 /drivers/misc/cxl/pci.c | |
parent | eda3693c842ed169af66af943554c648633769d0 (diff) |
cxl: cxl_afu_reset() -> __cxl_afu_reset()
Rename cxl_afu_reset() to __cxl_afu_reset() to we can reuse this function name
in the API.
Signed-off-by: Michael Neuling <mikey@neuling.org>
Acked-by: Ian Munsie <imunsie@au1.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'drivers/misc/cxl/pci.c')
-rw-r--r-- | drivers/misc/cxl/pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/misc/cxl/pci.c b/drivers/misc/cxl/pci.c index 12fa40676320..88de2ce79dca 100644 --- a/drivers/misc/cxl/pci.c +++ b/drivers/misc/cxl/pci.c | |||
@@ -657,7 +657,7 @@ static int sanitise_afu_regs(struct cxl_afu *afu) | |||
657 | reg = cxl_p2n_read(afu, CXL_AFU_Cntl_An); | 657 | reg = cxl_p2n_read(afu, CXL_AFU_Cntl_An); |
658 | if ((reg & CXL_AFU_Cntl_An_ES_MASK) != CXL_AFU_Cntl_An_ES_Disabled) { | 658 | if ((reg & CXL_AFU_Cntl_An_ES_MASK) != CXL_AFU_Cntl_An_ES_Disabled) { |
659 | dev_warn(&afu->dev, "WARNING: AFU was not disabled: %#.16llx\n", reg); | 659 | dev_warn(&afu->dev, "WARNING: AFU was not disabled: %#.16llx\n", reg); |
660 | if (cxl_afu_reset(afu)) | 660 | if (__cxl_afu_reset(afu)) |
661 | return -EIO; | 661 | return -EIO; |
662 | if (cxl_afu_disable(afu)) | 662 | if (cxl_afu_disable(afu)) |
663 | return -EIO; | 663 | return -EIO; |
@@ -761,7 +761,7 @@ static int cxl_init_afu(struct cxl *adapter, int slice, struct pci_dev *dev) | |||
761 | goto err2; | 761 | goto err2; |
762 | 762 | ||
763 | /* We need to reset the AFU before we can read the AFU descriptor */ | 763 | /* We need to reset the AFU before we can read the AFU descriptor */ |
764 | if ((rc = cxl_afu_reset(afu))) | 764 | if ((rc = __cxl_afu_reset(afu))) |
765 | goto err2; | 765 | goto err2; |
766 | 766 | ||
767 | if (cxl_verbose) | 767 | if (cxl_verbose) |