Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge branch 'unnecessary_resource_check'

Varka Bhadram says:

====================
cleanup on resource check

This series removes the duplication of sanity check for
platform_get_resource() return resource. It will be checked
with devm_ioremap_resource()

changes since v2:
- Merge #1 and #2 patches into single patch
- remove the comment

changes since v1:
- remove NULL dereference on resource_size()
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

+8 -33
-12
drivers/net/ethernet/apm/xgene/xgene_enet_main.c
··· 761 761 ndev = pdata->ndev; 762 762 763 763 res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "enet_csr"); 764 - if (!res) { 765 - dev_err(dev, "Resource enet_csr not defined\n"); 766 - return -ENODEV; 767 - } 768 764 pdata->base_addr = devm_ioremap_resource(dev, res); 769 765 if (IS_ERR(pdata->base_addr)) { 770 766 dev_err(dev, "Unable to retrieve ENET Port CSR region\n"); ··· 768 772 } 769 773 770 774 res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ring_csr"); 771 - if (!res) { 772 - dev_err(dev, "Resource ring_csr not defined\n"); 773 - return -ENODEV; 774 - } 775 775 pdata->ring_csr_addr = devm_ioremap_resource(dev, res); 776 776 if (IS_ERR(pdata->ring_csr_addr)) { 777 777 dev_err(dev, "Unable to retrieve ENET Ring CSR region\n"); ··· 775 783 } 776 784 777 785 res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ring_cmd"); 778 - if (!res) { 779 - dev_err(dev, "Resource ring_cmd not defined\n"); 780 - return -ENODEV; 781 - } 782 786 pdata->ring_cmd_addr = devm_ioremap_resource(dev, res); 783 787 if (IS_ERR(pdata->ring_cmd_addr)) { 784 788 dev_err(dev, "Unable to retrieve ENET Ring command region\n");
+2 -4
drivers/net/ethernet/marvell/pxa168_eth.c
··· 1450 1450 pep = netdev_priv(dev); 1451 1451 pep->dev = dev; 1452 1452 pep->clk = clk; 1453 + 1453 1454 res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 1454 - if (res == NULL) { 1455 - err = -ENODEV; 1456 - goto err_netdev; 1457 - } 1458 1455 pep->base = devm_ioremap_resource(&pdev->dev, res); 1459 1456 if (IS_ERR(pep->base)) { 1460 1457 err = -ENOMEM; 1461 1458 goto err_netdev; 1462 1459 } 1460 + 1463 1461 res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); 1464 1462 BUG_ON(!res); 1465 1463 dev->irq = res->start;
+2 -6
drivers/net/ethernet/renesas/sh_eth.c
··· 2769 2769 2770 2770 /* get base addr */ 2771 2771 res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 2772 - if (unlikely(res == NULL)) { 2773 - dev_err(&pdev->dev, "invalid resource\n"); 2774 - return -EINVAL; 2775 - } 2776 2772 2777 2773 ndev = alloc_etherdev(sizeof(struct sh_eth_private)); 2778 2774 if (!ndev) ··· 2777 2781 pm_runtime_enable(&pdev->dev); 2778 2782 pm_runtime_get_sync(&pdev->dev); 2779 2783 2780 - /* The sh Ether-specific entries in the device structure. */ 2781 - ndev->base_addr = res->start; 2782 2784 devno = pdev->id; 2783 2785 if (devno < 0) 2784 2786 devno = 0; ··· 2799 2805 ret = PTR_ERR(mdp->addr); 2800 2806 goto out_release; 2801 2807 } 2808 + 2809 + ndev->base_addr = res->start; 2802 2810 2803 2811 spin_lock_init(&mdp->lock); 2804 2812 mdp->pdev = pdev;
-3
drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c
··· 90 90 91 91 /* Get memory resource */ 92 92 res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 93 - if (!res) 94 - goto err_out; 95 - 96 93 addr = devm_ioremap_resource(dev, res); 97 94 if (IS_ERR(addr)) 98 95 return PTR_ERR(addr);
+2 -4
drivers/net/ethernet/wiznet/w5100.c
··· 638 638 } 639 639 640 640 mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); 641 - if (!mem) 642 - return -ENXIO; 643 - mem_size = resource_size(mem); 644 - 645 641 priv->base = devm_ioremap_resource(&pdev->dev, mem); 646 642 if (IS_ERR(priv->base)) 647 643 return PTR_ERR(priv->base); 644 + 645 + mem_size = resource_size(mem); 648 646 649 647 spin_lock_init(&priv->reg_lock); 650 648 priv->indirect = mem_size < W5100_BUS_DIRECT_SIZE;
+2 -4
drivers/net/ethernet/wiznet/w5300.c
··· 558 558 } 559 559 560 560 mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); 561 - if (!mem) 562 - return -ENXIO; 563 - mem_size = resource_size(mem); 564 - 565 561 priv->base = devm_ioremap_resource(&pdev->dev, mem); 566 562 if (IS_ERR(priv->base)) 567 563 return PTR_ERR(priv->base); 564 + 565 + mem_size = resource_size(mem); 568 566 569 567 spin_lock_init(&priv->reg_lock); 570 568 priv->indirect = mem_size < W5300_BUS_DIRECT_SIZE;