mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 10:57:46 +00:00
net: dsa: bcm_sf2: Use device managed helpers
Now that we have converted the drivers into a proper platform device driver, we can use the device managed helper functions to simplify the error paths a bit wrt. register resources and IRQs. Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
d9338023fb
commit
4bd11675cf
1 changed files with 13 additions and 23 deletions
|
@ -1630,6 +1630,7 @@ static int bcm_sf2_sw_probe(struct platform_device *pdev)
|
|||
struct bcm_sf2_priv *priv;
|
||||
struct dsa_switch *ds;
|
||||
void __iomem **base;
|
||||
struct resource *r;
|
||||
unsigned int i;
|
||||
u32 reg, rev;
|
||||
int ret;
|
||||
|
@ -1655,11 +1656,11 @@ static int bcm_sf2_sw_probe(struct platform_device *pdev)
|
|||
|
||||
base = &priv->core;
|
||||
for (i = 0; i < BCM_SF2_REGS_NUM; i++) {
|
||||
*base = of_iomap(dn, i);
|
||||
if (*base == NULL) {
|
||||
r = platform_get_resource(pdev, IORESOURCE_MEM, i);
|
||||
*base = devm_ioremap_resource(&pdev->dev, r);
|
||||
if (IS_ERR(*base)) {
|
||||
pr_err("unable to find register: %s\n", reg_names[i]);
|
||||
ret = -ENOMEM;
|
||||
goto out_unmap;
|
||||
return PTR_ERR(*base);
|
||||
}
|
||||
base++;
|
||||
}
|
||||
|
@ -1667,30 +1668,30 @@ static int bcm_sf2_sw_probe(struct platform_device *pdev)
|
|||
ret = bcm_sf2_sw_rst(priv);
|
||||
if (ret) {
|
||||
pr_err("unable to software reset switch: %d\n", ret);
|
||||
goto out_unmap;
|
||||
return ret;
|
||||
}
|
||||
|
||||
ret = bcm_sf2_mdio_register(ds);
|
||||
if (ret) {
|
||||
pr_err("failed to register MDIO bus\n");
|
||||
goto out_unmap;
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* Disable all interrupts and request them */
|
||||
bcm_sf2_intr_disable(priv);
|
||||
|
||||
ret = request_irq(priv->irq0, bcm_sf2_switch_0_isr, 0,
|
||||
"switch_0", priv);
|
||||
ret = devm_request_irq(&pdev->dev, priv->irq0, bcm_sf2_switch_0_isr, 0,
|
||||
"switch_0", priv);
|
||||
if (ret < 0) {
|
||||
pr_err("failed to request switch_0 IRQ\n");
|
||||
goto out_mdio;
|
||||
}
|
||||
|
||||
ret = request_irq(priv->irq1, bcm_sf2_switch_1_isr, 0,
|
||||
"switch_1", priv);
|
||||
ret = devm_request_irq(&pdev->dev, priv->irq1, bcm_sf2_switch_1_isr, 0,
|
||||
"switch_1", priv);
|
||||
if (ret < 0) {
|
||||
pr_err("failed to request switch_1 IRQ\n");
|
||||
goto out_free_irq0;
|
||||
goto out_mdio;
|
||||
}
|
||||
|
||||
/* Reset the MIB counters */
|
||||
|
@ -1720,7 +1721,7 @@ static int bcm_sf2_sw_probe(struct platform_device *pdev)
|
|||
|
||||
ret = dsa_register_switch(ds, dn);
|
||||
if (ret)
|
||||
goto out_free_irq1;
|
||||
goto out_mdio;
|
||||
|
||||
pr_info("Starfighter 2 top: %x.%02x, core: %x.%02x base: 0x%p, IRQs: %d, %d\n",
|
||||
priv->hw_params.top_rev >> 8, priv->hw_params.top_rev & 0xff,
|
||||
|
@ -1729,19 +1730,8 @@ static int bcm_sf2_sw_probe(struct platform_device *pdev)
|
|||
|
||||
return 0;
|
||||
|
||||
out_free_irq1:
|
||||
free_irq(priv->irq1, priv);
|
||||
out_free_irq0:
|
||||
free_irq(priv->irq0, priv);
|
||||
out_mdio:
|
||||
bcm_sf2_mdio_unregister(priv);
|
||||
out_unmap:
|
||||
base = &priv->core;
|
||||
for (i = 0; i < BCM_SF2_REGS_NUM; i++) {
|
||||
if (*base)
|
||||
iounmap(*base);
|
||||
base++;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue