> -----Original Message-----
> From: Intel-wired-lan <[email protected]> On Behalf
> Of Rongguang Wei
> Sent: Tuesday, June 30, 2026 5:26 AM
> To: [email protected]; [email protected]
> Cc: Nguyen, Anthony L <[email protected]>; Kitszel,
> Przemyslaw <[email protected]>; [email protected];
> Rongguang Wei <[email protected]>
> Subject: [Intel-wired-lan] [PATCH net-next v1] ice: use dev_err_probe
> in all appropriate places in ice_probe()
>
> From: Rongguang Wei <[email protected]>
>
> Use dev_err_probe() can conveniently combines printing an error
> message with returning the errno and also simplify the code.
>
I'd recommend to fix the commit message, like:
ice: use dev_err_probe() in ice_probe()
dev_err_probe() logs the error and returns the supplied error code, which
allows probe error paths to be written more compactly.
Use dev_err_probe() in ice_probe() for error paths that currently print an
error message and immediately return the same error code. This keeps the
existing error handling semantics while reducing open-coded logging and
return sequences.
With the best regards
Reviewed-by: Aleksandr Loktionov <[email protected]>
> Signed-off-by: Rongguang Wei <[email protected]>
> ---
> 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);
>
> --
> 2.25.1
