Re: [Intel-wired-lan] [PATCH net-next v1] ice: use dev_err_probe in all appropriate places in ice_probe()

[Przemek Kitszel]

On 6/30/26 05:25, Rongguang Wei wrote:

From: Rongguang Wei <weironggu...@kylinos.cn>

Use dev_err_probe() can conveniently combines printing

s/combines/combine/
you could also wrap at 75 chars, to have better formatting.

an error message with returning the errno and also
simplify the code.

Signed-off-by: Rongguang Wei <weironggu...@kylinos.cn>

thank you,
Reviewed-by: Przemek Kitszel <przemyslaw.kits...@intel.com>

---
  drivers/net/ethernet/intel/ice/ice_main.c | 24 ++++++++---------------
  1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/drivers/net/ethernet/intel/ice/ice_main.c 
b/drivers/net/ethernet/intel/ice/ice_main.c
index e2fbe111f849..81959eaec708 100644
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -5167,10 +5167,8 @@ ice_probe(struct pci_dev *pdev, const struct 
pci_device_id __always_unused *ent)
        struct ice_hw *hw;
        int err;

- if (pdev->is_virtfn) {

-               dev_err(dev, "can't probe a virtual function\n");
-               return -EINVAL;
-       }
+       if (pdev->is_virtfn)
+               return dev_err_probe(dev, -EINVAL, "can't probe a virtual 
function\n");

/* when under a kdump kernel initiate a reset before enabling the

         * device in order to clear out any pending DMA transactions. These
@@ -5194,10 +5192,8 @@ ice_probe(struct pci_dev *pdev, const struct 
pci_device_id __always_unused *ent)
                return err;

err = pcim_iomap_regions(pdev, BIT(ICE_BAR0), dev_driver_string(dev));

-       if (err) {
-               dev_err(dev, "BAR0 I/O map error %d\n", err);
-               return err;
-       }
+       if (err)
+               return dev_err_probe(dev, err, "BAR0 I/O map error %d\n", err);

pf = ice_allocate_pf(dev);

        if (!pf)
@@ -5208,10 +5204,8 @@ ice_probe(struct pci_dev *pdev, const struct 
pci_device_id __always_unused *ent)

/* set up for high or low DMA */

        err = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64));
-       if (err) {
-               dev_err(dev, "DMA configuration failed: 0x%x\n", err);
-               return err;
-       }
+       if (err)
+               return dev_err_probe(dev, err, "DMA configuration failed: 
0x%x\n", err);

pci_set_master(pdev);

        pf->pdev = pdev;
@@ -5246,10 +5240,8 @@ ice_probe(struct pci_dev *pdev, const struct 
pci_device_id __always_unused *ent)
                return ice_probe_recovery_mode(pf);

err = ice_init_hw(hw);

-       if (err) {
-               dev_err(dev, "ice_init_hw failed: %d\n", err);
-               return err;
-       }
+       if (err)
+               return dev_err_probe(dev, err, "ice_init_hw failed: %d\n", err);

ice_init_dev_hw(pf);