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

wan: lmc: Switch to using managed resources

Use managed resource functions devm_kzalloc and pcim_enable_device
to simplify error handling. Subsequently, remove unnecessary
kfree, pci_disable_device and pci_release_regions.

To be compatible with the change, various gotos are replaced with
direct returns and unneeded labels are dropped.

Also, `sc` was only being freed in the probe function and not the
remove function before the change. By using devm_kzalloc this patch
also fixes this memory leak.

Signed-off-by: Amitoj Kaur Chawla <amitoj1606@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Amitoj Kaur Chawla and committed by
David S. Miller
7cb43beb 7da5ee09

+7 -20
+7 -20
drivers/net/wan/lmc/lmc_main.c
··· 826 826 827 827 /* lmc_trace(dev, "lmc_init_one in"); */ 828 828 829 - err = pci_enable_device(pdev); 829 + err = pcim_enable_device(pdev); 830 830 if (err) { 831 831 printk(KERN_ERR "lmc: pci enable failed: %d\n", err); 832 832 return err; ··· 835 835 err = pci_request_regions(pdev, "lmc"); 836 836 if (err) { 837 837 printk(KERN_ERR "lmc: pci_request_region failed\n"); 838 - goto err_req_io; 838 + return err; 839 839 } 840 840 841 841 /* 842 842 * Allocate our own device structure 843 843 */ 844 - sc = kzalloc(sizeof(lmc_softc_t), GFP_KERNEL); 845 - if (!sc) { 846 - err = -ENOMEM; 847 - goto err_kzalloc; 848 - } 844 + sc = devm_kzalloc(&pdev->dev, sizeof(lmc_softc_t), GFP_KERNEL); 845 + if (!sc) 846 + return -ENOMEM; 849 847 850 848 dev = alloc_hdlcdev(sc); 851 849 if (!dev) { 852 850 printk(KERN_ERR "lmc:alloc_netdev for device failed\n"); 853 - err = -ENOMEM; 854 - goto err_hdlcdev; 851 + return -ENOMEM; 855 852 } 856 853 857 854 ··· 885 888 if (err) { 886 889 printk(KERN_ERR "%s: register_netdev failed.\n", dev->name); 887 890 free_netdev(dev); 888 - goto err_hdlcdev; 891 + return err; 889 892 } 890 893 891 894 sc->lmc_cardtype = LMC_CARDTYPE_UNKNOWN; ··· 968 971 969 972 lmc_trace(dev, "lmc_init_one out"); 970 973 return 0; 971 - 972 - err_hdlcdev: 973 - kfree(sc); 974 - err_kzalloc: 975 - pci_release_regions(pdev); 976 - err_req_io: 977 - pci_disable_device(pdev); 978 - return err; 979 974 } 980 975 981 976 /* ··· 981 992 printk(KERN_DEBUG "%s: removing...\n", dev->name); 982 993 unregister_hdlc_device(dev); 983 994 free_netdev(dev); 984 - pci_release_regions(pdev); 985 - pci_disable_device(pdev); 986 995 } 987 996 } 988 997