lkml.org 
[lkml]   [2021]   [Apr]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 net-next 02/10] net: korina: Use devres functions
    Date
    Simplify probe/remove code by using devm_ functions.

    Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
    ---
    drivers/net/ethernet/korina.c | 64 ++++++++++++-----------------------
    1 file changed, 21 insertions(+), 43 deletions(-)

    diff --git a/drivers/net/ethernet/korina.c b/drivers/net/ethernet/korina.c
    index 3f6f4835a9bc..6bef5d590ebe 100644
    --- a/drivers/net/ethernet/korina.c
    +++ b/drivers/net/ethernet/korina.c
    @@ -105,9 +105,9 @@ enum chain_status {

    /* Information that need to be kept for each board. */
    struct korina_private {
    - struct eth_regs *eth_regs;
    - struct dma_reg *rx_dma_regs;
    - struct dma_reg *tx_dma_regs;
    + struct eth_regs __iomem *eth_regs;
    + struct dma_reg __iomem *rx_dma_regs;
    + struct dma_reg __iomem *tx_dma_regs;
    struct dma_desc *td_ring; /* transmit descriptor ring */
    struct dma_desc *rd_ring; /* receive descriptor ring */

    @@ -1042,10 +1042,10 @@ static int korina_probe(struct platform_device *pdev)
    struct korina_device *bif = platform_get_drvdata(pdev);
    struct korina_private *lp;
    struct net_device *dev;
    - struct resource *r;
    + void __iomem *p;
    int rc;

    - dev = alloc_etherdev(sizeof(struct korina_private));
    + dev = devm_alloc_etherdev(&pdev->dev, sizeof(struct korina_private));
    if (!dev)
    return -ENOMEM;

    @@ -1058,36 +1058,30 @@ static int korina_probe(struct platform_device *pdev)
    lp->rx_irq = platform_get_irq_byname(pdev, "korina_rx");
    lp->tx_irq = platform_get_irq_byname(pdev, "korina_tx");

    - r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "korina_regs");
    - dev->base_addr = r->start;
    - lp->eth_regs = ioremap(r->start, resource_size(r));
    - if (!lp->eth_regs) {
    + p = devm_platform_ioremap_resource_byname(pdev, "korina_regs");
    + if (!p) {
    printk(KERN_ERR DRV_NAME ": cannot remap registers\n");
    - rc = -ENXIO;
    - goto probe_err_out;
    + return -ENOMEM;
    }
    + lp->eth_regs = p;

    - r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "korina_dma_rx");
    - lp->rx_dma_regs = ioremap(r->start, resource_size(r));
    - if (!lp->rx_dma_regs) {
    + p = devm_platform_ioremap_resource_byname(pdev, "korina_dma_rx");
    + if (!p) {
    printk(KERN_ERR DRV_NAME ": cannot remap Rx DMA registers\n");
    - rc = -ENXIO;
    - goto probe_err_dma_rx;
    + return -ENOMEM;
    }
    + lp->rx_dma_regs = p;

    - r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "korina_dma_tx");
    - lp->tx_dma_regs = ioremap(r->start, resource_size(r));
    - if (!lp->tx_dma_regs) {
    + p = devm_platform_ioremap_resource_byname(pdev, "korina_dma_tx");
    + if (!p) {
    printk(KERN_ERR DRV_NAME ": cannot remap Tx DMA registers\n");
    - rc = -ENXIO;
    - goto probe_err_dma_tx;
    + return -ENOMEM;
    }
    + lp->tx_dma_regs = p;

    lp->td_ring = kmalloc(TD_RING_SIZE + RD_RING_SIZE, GFP_KERNEL);
    - if (!lp->td_ring) {
    - rc = -ENXIO;
    - goto probe_err_td_ring;
    - }
    + if (!lp->td_ring)
    + return -ENOMEM;

    dma_cache_inv((unsigned long)(lp->td_ring),
    TD_RING_SIZE + RD_RING_SIZE);
    @@ -1117,7 +1111,8 @@ static int korina_probe(struct platform_device *pdev)
    if (rc < 0) {
    printk(KERN_ERR DRV_NAME
    ": cannot register net device: %d\n", rc);
    - goto probe_err_register;
    + kfree((struct dma_desc *)KSEG0ADDR(lp->td_ring));
    + return rc;
    }
    timer_setup(&lp->media_check_timer, korina_poll_media, 0);

    @@ -1125,20 +1120,7 @@ static int korina_probe(struct platform_device *pdev)

    printk(KERN_INFO "%s: " DRV_NAME "-" DRV_VERSION " " DRV_RELDATE "\n",
    dev->name);
    -out:
    return rc;
    -
    -probe_err_register:
    - kfree((struct dma_desc *)KSEG0ADDR(lp->td_ring));
    -probe_err_td_ring:
    - iounmap(lp->tx_dma_regs);
    -probe_err_dma_tx:
    - iounmap(lp->rx_dma_regs);
    -probe_err_dma_rx:
    - iounmap(lp->eth_regs);
    -probe_err_out:
    - free_netdev(dev);
    - goto out;
    }

    static int korina_remove(struct platform_device *pdev)
    @@ -1146,13 +1128,9 @@ static int korina_remove(struct platform_device *pdev)
    struct korina_device *bif = platform_get_drvdata(pdev);
    struct korina_private *lp = netdev_priv(bif->dev);

    - iounmap(lp->eth_regs);
    - iounmap(lp->rx_dma_regs);
    - iounmap(lp->tx_dma_regs);
    kfree((struct dma_desc *)KSEG0ADDR(lp->td_ring));

    unregister_netdev(bif->dev);
    - free_netdev(bif->dev);

    return 0;
    }
    --
    2.29.2
    \
     
     \ /
      Last update: 2021-04-15 01:07    [W:4.495 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site