crypto: qat - use pci logging variants for PCI-specific messages

Replace dev_err(&pdev->dev, ...), dev_info(&pdev->dev, ...) and
dev_dbg(&pdev->dev, ...) with pci_err(), pci_info() and pci_dbg()
where the log message relates to a PCI subsystem operation such as
device enable, BAR mapping, PCI region requests, PCI state
save/restore, and SR-IOV management.

Messages about driver-level logic (NUMA topology, device matching,
accelerator units, capabilities, configuration, DMA) are intentionally
left as dev_err() even when a struct pci_dev pointer is in scope,
since those concern the device or driver rather than the PCI bus.

No functional change.

Suggested-by: Andy Shevchenko <andriy.shevchenko@intel.com>
Signed-off-by: Ahsan Atta <ahsan.atta@intel.com>
Reviewed-by: Giovanni Cabiddu <giovanni.cabiddu@intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/intel/qat/qat_420xx/adf_drv.c b/drivers/crypto/intel/qat/qat_420xx/adf_drv.c
index 265bd52778c57441c5b72f2b8533b70d04ab8730..0f0827e2b0bdcf4e63e0201c75bdd94f868fd295 100644 (file)
--- a/drivers/crypto/intel/qat/qat_420xx/adf_drv.c
+++ b/drivers/crypto/intel/qat/qat_420xx/adf_drv.c
@@ -101,7 +101,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        /* Enable PCI device */
        ret = pcim_enable_device(pdev);
        if (ret) {
-               dev_err(&pdev->dev, "Can't enable PCI device.\n");
+               pci_err(pdev, "Can't enable PCI device.\n");
                goto out_err;
        }
 
@@ -131,7 +131,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
        ret = pcim_request_all_regions(pdev, pci_name(pdev));
        if (ret) {
-               dev_err(&pdev->dev, "Failed to request PCI regions.\n");
+               pci_err(pdev, "Failed to request PCI regions.\n");
                goto out_err;
        }
 
@@ -140,14 +140,14 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                bar = &accel_pci_dev->pci_bars[i++];
                bar->virt_addr = pcim_iomap(pdev, bar_nr, 0);
                if (!bar->virt_addr) {
-                       dev_err(&pdev->dev, "Failed to ioremap PCI region.\n");
+                       pci_err(pdev, "Failed to ioremap PCI region.\n");
                        ret = -ENOMEM;
                        goto out_err;
                }
        }
 
        if (pci_save_state(pdev)) {
-               dev_err(&pdev->dev, "Failed to save pci state.\n");
+               pci_err(pdev, "Failed to save pci state.\n");
                ret = -ENOMEM;
                goto out_err;
        }

diff --git a/drivers/crypto/intel/qat/qat_4xxx/adf_drv.c b/drivers/crypto/intel/qat/qat_4xxx/adf_drv.c
index 681c4dd8f3d286ef6008c4f3343f3f60db9ecc26..aa95f762cb4b469f1b887e7896be1f518f12d9f4 100644 (file)
--- a/drivers/crypto/intel/qat/qat_4xxx/adf_drv.c
+++ b/drivers/crypto/intel/qat/qat_4xxx/adf_drv.c
@@ -103,7 +103,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        /* Enable PCI device */
        ret = pcim_enable_device(pdev);
        if (ret) {
-               dev_err(&pdev->dev, "Can't enable PCI device.\n");
+               pci_err(pdev, "Can't enable PCI device.\n");
                goto out_err;
        }
 
@@ -133,7 +133,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
        ret = pcim_request_all_regions(pdev, pci_name(pdev));
        if (ret) {
-               dev_err(&pdev->dev, "Failed to request PCI regions.\n");
+               pci_err(pdev, "Failed to request PCI regions.\n");
                goto out_err;
        }
 
@@ -142,14 +142,14 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                bar = &accel_pci_dev->pci_bars[i++];
                bar->virt_addr = pcim_iomap(pdev, bar_nr, 0);
                if (!bar->virt_addr) {
-                       dev_err(&pdev->dev, "Failed to ioremap PCI region.\n");
+                       pci_err(pdev, "Failed to ioremap PCI region.\n");
                        ret = -ENOMEM;
                        goto out_err;
                }
        }
 
        if (pci_save_state(pdev)) {
-               dev_err(&pdev->dev, "Failed to save pci state.\n");
+               pci_err(pdev, "Failed to save pci state.\n");
                ret = -ENOMEM;
                goto out_err;
        }

diff --git a/drivers/crypto/intel/qat/qat_c3xxx/adf_drv.c b/drivers/crypto/intel/qat/qat_c3xxx/adf_drv.c
index ded52744b4fc855fd1c9e7da57cf3fe36de312fb..e816cc00632fda27cc76a415fc5b85f096d34662 100644 (file)
--- a/drivers/crypto/intel/qat/qat_c3xxx/adf_drv.c
+++ b/drivers/crypto/intel/qat/qat_c3xxx/adf_drv.c
@@ -162,14 +162,14 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                bar->size = pci_resource_len(pdev, bar_nr);
                bar->virt_addr = pci_iomap(accel_pci_dev->pci_dev, bar_nr, 0);
                if (!bar->virt_addr) {
-                       dev_err(&pdev->dev, "Failed to map BAR %d\n", bar_nr);
+                       pci_err(pdev, "Failed to map BAR %d\n", bar_nr);
                        ret = -EFAULT;
                        goto out_err_free_reg;
                }
        }
 
        if (pci_save_state(pdev)) {
-               dev_err(&pdev->dev, "Failed to save pci state\n");
+               pci_err(pdev, "Failed to save pci state\n");
                ret = -ENOMEM;
                goto out_err_free_reg;
        }

diff --git a/drivers/crypto/intel/qat/qat_c3xxxvf/adf_drv.c b/drivers/crypto/intel/qat/qat_c3xxxvf/adf_drv.c
index e7600d284ed3a571effbda14cfe9a49f3775720e..1c77f0a1882b9c6403162a6c79e4901c442580c9 100644 (file)
--- a/drivers/crypto/intel/qat/qat_c3xxxvf/adf_drv.c
+++ b/drivers/crypto/intel/qat/qat_c3xxxvf/adf_drv.c
@@ -158,7 +158,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                bar->size = pci_resource_len(pdev, bar_nr);
                bar->virt_addr = pci_iomap(accel_pci_dev->pci_dev, bar_nr, 0);
                if (!bar->virt_addr) {
-                       dev_err(&pdev->dev, "Failed to map BAR %d\n", bar_nr);
+                       pci_err(pdev, "Failed to map BAR %d\n", bar_nr);
                        ret = -EFAULT;
                        goto out_err_free_reg;
                }

diff --git a/drivers/crypto/intel/qat/qat_c62x/adf_drv.c b/drivers/crypto/intel/qat/qat_c62x/adf_drv.c
index 2ebff5855b0170b127cdf8a9cb977430d7725af1..f48f3b4375450e67a5ba9ec5f842dac598c9b5cb 100644 (file)
--- a/drivers/crypto/intel/qat/qat_c62x/adf_drv.c
+++ b/drivers/crypto/intel/qat/qat_c62x/adf_drv.c
@@ -162,14 +162,14 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                bar->size = pci_resource_len(pdev, bar_nr);
                bar->virt_addr = pci_iomap(accel_pci_dev->pci_dev, bar_nr, 0);
                if (!bar->virt_addr) {
-                       dev_err(&pdev->dev, "Failed to map BAR %d\n", bar_nr);
+                       pci_err(pdev, "Failed to map BAR %d\n", bar_nr);
                        ret = -EFAULT;
                        goto out_err_free_reg;
                }
        }
 
        if (pci_save_state(pdev)) {
-               dev_err(&pdev->dev, "Failed to save pci state\n");
+               pci_err(pdev, "Failed to save pci state\n");
                ret = -ENOMEM;
                goto out_err_free_reg;
        }

diff --git a/drivers/crypto/intel/qat/qat_c62xvf/adf_drv.c b/drivers/crypto/intel/qat/qat_c62xvf/adf_drv.c
index 91e148bb487061ae7d2f55457c8bb2c9dc9a35bb..b96f19e31d0500bf43d689ed210d5c3861983845 100644 (file)
--- a/drivers/crypto/intel/qat/qat_c62xvf/adf_drv.c
+++ b/drivers/crypto/intel/qat/qat_c62xvf/adf_drv.c
@@ -158,7 +158,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                bar->size = pci_resource_len(pdev, bar_nr);
                bar->virt_addr = pci_iomap(accel_pci_dev->pci_dev, bar_nr, 0);
                if (!bar->virt_addr) {
-                       dev_err(&pdev->dev, "Failed to map BAR %d\n", bar_nr);
+                       pci_err(pdev, "Failed to map BAR %d\n", bar_nr);
                        ret = -EFAULT;
                        goto out_err_free_reg;
                }

diff --git a/drivers/crypto/intel/qat/qat_common/adf_aer.c b/drivers/crypto/intel/qat/qat_common/adf_aer.c
index 3fc7d13e882c82049061e636927bd3600de6d2c7..d58cd7fbf70771c34a42e256a842ca3035421c79 100644 (file)
--- a/drivers/crypto/intel/qat/qat_common/adf_aer.c
+++ b/drivers/crypto/intel/qat/qat_common/adf_aer.c
@@ -22,7 +22,7 @@ static pci_ers_result_t reset_prepare(struct pci_dev *pdev)
        struct adf_accel_dev *accel_dev = adf_devmgr_pci_to_accel_dev(pdev);
 
        if (!accel_dev) {
-               dev_err(&pdev->dev, "Can't find acceleration device\n");
+               pci_err(pdev, "Can't find acceleration device\n");
                return PCI_ERS_RESULT_DISCONNECT;
        }
 
@@ -46,7 +46,7 @@ static pci_ers_result_t reset_done(struct pci_dev *pdev)
        int res;
 
        if (!accel_dev) {
-               dev_err(&pdev->dev, "Can't find acceleration device\n");
+               pci_err(pdev, "Can't find acceleration device\n");
                return PCI_ERS_RESULT_DISCONNECT;
        }
 
@@ -64,7 +64,7 @@ static pci_ers_result_t reset_done(struct pci_dev *pdev)
        clear_bit(ADF_STATUS_RESTARTING, &accel_dev->status);
 
 reset_complete:
-       dev_info(&pdev->dev, "Device reset completed successfully\n");
+       pci_info(pdev, "Device reset completed successfully\n");
 
        return PCI_ERS_RESULT_RECOVERED;
 }
@@ -74,14 +74,14 @@ static pci_ers_result_t adf_error_detected(struct pci_dev *pdev,
 {
        struct adf_accel_dev *accel_dev = adf_devmgr_pci_to_accel_dev(pdev);
 
-       dev_info(&pdev->dev, "Acceleration driver hardware error detected.\n");
+       pci_info(pdev, "Acceleration driver hardware error detected.\n");
        if (!accel_dev) {
-               dev_err(&pdev->dev, "Can't find acceleration device\n");
+               pci_err(pdev, "Can't find acceleration device\n");
                return PCI_ERS_RESULT_DISCONNECT;
        }
 
        if (state == pci_channel_io_perm_failure) {
-               dev_err(&pdev->dev, "Can't recover from device error\n");
+               pci_err(pdev, "Can't recover from device error\n");
                return PCI_ERS_RESULT_DISCONNECT;
        }
 
@@ -116,10 +116,9 @@ void adf_reset_sbr(struct adf_accel_dev *accel_dev)
                parent = pdev;
 
        if (!pci_wait_for_pending_transaction(pdev))
-               dev_info(&GET_DEV(accel_dev),
-                        "Transaction still in progress. Proceeding\n");
+               pci_info(pdev, "Transaction still in progress. Proceeding\n");
 
-       dev_info(&GET_DEV(accel_dev), "Secondary bus reset\n");
+       pci_info(pdev, "Secondary bus reset\n");
 
        pci_read_config_word(parent, PCI_BRIDGE_CONTROL, &bridge_ctl);
        bridge_ctl |= PCI_BRIDGE_CTL_BUS_RESET;
@@ -247,8 +246,8 @@ static pci_ers_result_t adf_slot_reset(struct pci_dev *pdev)
 
 static void adf_resume(struct pci_dev *pdev)
 {
-       dev_info(&pdev->dev, "Acceleration driver reset completed\n");
-       dev_info(&pdev->dev, "Device is up and running\n");
+       pci_info(pdev, "Acceleration driver reset completed\n");
+       pci_info(pdev, "Device is up and running\n");
 }
 
 static void adf_reset_prepare(struct pci_dev *pdev)

diff --git a/drivers/crypto/intel/qat/qat_common/adf_sriov.c b/drivers/crypto/intel/qat/qat_common/adf_sriov.c
index f2011300a92949a562a82aa03a795b343664fcb7..f45ca2eecc004ff3b2d0167c10f691fc2a2bf1aa 100644 (file)
--- a/drivers/crypto/intel/qat/qat_common/adf_sriov.c
+++ b/drivers/crypto/intel/qat/qat_common/adf_sriov.c
@@ -240,7 +240,7 @@ void adf_reenable_sriov(struct adf_accel_dev *accel_dev)
        if (adf_add_sriov_configuration(accel_dev))
                return;
 
-       dev_dbg(&pdev->dev, "Re-enabling SRIOV\n");
+       pci_dbg(pdev, "Re-enabling SRIOV\n");
        adf_enable_sriov(accel_dev);
 }
 

diff --git a/drivers/crypto/intel/qat/qat_dh895xcc/adf_drv.c b/drivers/crypto/intel/qat/qat_dh895xcc/adf_drv.c
index 97ad53eef38f14ab7bb13b7b25d5cd3b33eddf23..571f302edea31ac4a5712d991129b792bb91e32e 100644 (file)
--- a/drivers/crypto/intel/qat/qat_dh895xcc/adf_drv.c
+++ b/drivers/crypto/intel/qat/qat_dh895xcc/adf_drv.c
@@ -162,14 +162,14 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                bar->size = pci_resource_len(pdev, bar_nr);
                bar->virt_addr = pci_iomap(accel_pci_dev->pci_dev, bar_nr, 0);
                if (!bar->virt_addr) {
-                       dev_err(&pdev->dev, "Failed to map BAR %d\n", bar_nr);
+                       pci_err(pdev, "Failed to map BAR %d\n", bar_nr);
                        ret = -EFAULT;
                        goto out_err_free_reg;
                }
        }
 
        if (pci_save_state(pdev)) {
-               dev_err(&pdev->dev, "Failed to save pci state\n");
+               pci_err(pdev, "Failed to save pci state\n");
                ret = -ENOMEM;
                goto out_err_free_reg;
        }

diff --git a/drivers/crypto/intel/qat/qat_dh895xccvf/adf_drv.c b/drivers/crypto/intel/qat/qat_dh895xccvf/adf_drv.c
index a5edda8bad3279fc43c38f765a4e457aaa1ffc00..481551a0870846ca51d799337352257d502e6897 100644 (file)
--- a/drivers/crypto/intel/qat/qat_dh895xccvf/adf_drv.c
+++ b/drivers/crypto/intel/qat/qat_dh895xccvf/adf_drv.c
@@ -158,7 +158,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                bar->size = pci_resource_len(pdev, bar_nr);
                bar->virt_addr = pci_iomap(accel_pci_dev->pci_dev, bar_nr, 0);
                if (!bar->virt_addr) {
-                       dev_err(&pdev->dev, "Failed to map BAR %d\n", bar_nr);
+                       pci_err(pdev, "Failed to map BAR %d\n", bar_nr);
                        ret = -EFAULT;
                        goto out_err_free_reg;
                }