On Thu, Jun 06, 2024 at 10:52:24AM +0200, Martin Schiller wrote: > @@ -2050,8 +2048,9 @@ static int gswip_gphy_fw_list(struct gswip_priv *priv, > priv->gphy_fw_name_cfg = &xrx200a2x_gphy_data; > break; > default: > - dev_err(dev, "unknown GSWIP version: 0x%x", version); > - return -ENOENT; > + return dev_err_probe(dev, -ENOENT, > + "unknown GSWIP version: 0x%x", > + version); > } > } > > @@ -2059,10 +2058,9 @@ static int gswip_gphy_fw_list(struct gswip_priv *priv, > if (match && match->data) > priv->gphy_fw_name_cfg = match->data; > > - if (!priv->gphy_fw_name_cfg) { > - dev_err(dev, "GPHY compatible type not supported"); > - return -ENOENT; > - } > + if (!priv->gphy_fw_name_cfg) > + return dev_err_probe(dev, -ENOENT, > + "GPHY compatible type not supported"); > > priv->num_gphy_fw = of_get_available_child_count(gphy_fw_list_np); > if (!priv->num_gphy_fw) > @@ -2163,8 +2161,8 @@ static int gswip_probe(struct platform_device *pdev) > return -EINVAL; > break; > default: > - dev_err(dev, "unknown GSWIP version: 0x%x", version); > - return -ENOENT; > + return dev_err_probe(dev, -ENOENT, > + "unknown GSWIP version: 0x%x", version); > } > > /* bring up the mdio bus */ > @@ -2172,28 +2170,27 @@ static int gswip_probe(struct platform_device *pdev) > if (!dsa_is_cpu_port(priv->ds, priv->hw_info->cpu_port)) { > - dev_err(dev, "wrong CPU port defined, HW only supports port: %i", > - priv->hw_info->cpu_port); > - err = -EINVAL; > + err = dev_err_probe(dev, -EINVAL, > + "wrong CPU port defined, HW only supports port: %i", > + priv->hw_info->cpu_port); > goto disable_switch; > } Nitpick: there is no terminating \n here.