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

hwmon: (w83627ehf) Remove w83627ehf_remove()

Using devm_request_region() allows us to omit
w83627ehf_remove() and also simplifies error
handling during probe.
Also fixed a checkpatch issue.

Signed-off-by: Armin Wolf <W_Armin@gmx.de>
Link: https://lore.kernel.org/r/20210709184501.6546-3-W_Armin@gmx.de
Signed-off-by: Guenter Roeck <linux@roeck-us.net>

authored by

Armin Wolf and committed by
Guenter Roeck
228f2aed 964c1c91

+7 -35
+7 -35
drivers/hwmon/w83627ehf.c
··· 1705 1705 struct device *hwmon_dev; 1706 1706 1707 1707 res = platform_get_resource(pdev, IORESOURCE_IO, 0); 1708 - if (!request_region(res->start, IOREGION_LENGTH, DRVNAME)) { 1709 - err = -EBUSY; 1710 - dev_err(dev, "Failed to request region 0x%lx-0x%lx\n", 1711 - (unsigned long)res->start, 1712 - (unsigned long)res->start + IOREGION_LENGTH - 1); 1713 - goto exit; 1714 - } 1708 + if (!devm_request_region(dev, res->start, IOREGION_LENGTH, DRVNAME)) 1709 + return -EBUSY; 1715 1710 1716 - data = devm_kzalloc(&pdev->dev, sizeof(struct w83627ehf_data), 1717 - GFP_KERNEL); 1718 - if (!data) { 1719 - err = -ENOMEM; 1720 - goto exit_release; 1721 - } 1711 + data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL); 1712 + if (!data) 1713 + return -ENOMEM; 1722 1714 1723 1715 data->addr = res->start; 1724 1716 mutex_init(&data->lock); ··· 1874 1882 1875 1883 err = superio_enter(sio_data->sioreg); 1876 1884 if (err) 1877 - goto exit_release; 1885 + return err; 1878 1886 1879 1887 /* Read VID value */ 1880 1888 if (sio_data->kind == w83667hg || sio_data->kind == w83667hg_b) { ··· 1943 1951 data, 1944 1952 &w83627ehf_chip_info, 1945 1953 w83627ehf_groups); 1946 - if (IS_ERR(hwmon_dev)) { 1947 - err = PTR_ERR(hwmon_dev); 1948 - goto exit_release; 1949 - } 1950 - 1951 - return 0; 1952 - 1953 - exit_release: 1954 - release_region(res->start, IOREGION_LENGTH); 1955 - exit: 1956 - return err; 1957 - } 1958 - 1959 - static int w83627ehf_remove(struct platform_device *pdev) 1960 - { 1961 - struct w83627ehf_data *data = platform_get_drvdata(pdev); 1962 - 1963 - release_region(data->addr, IOREGION_LENGTH); 1964 - 1965 - return 0; 1954 + return PTR_ERR_OR_ZERO(hwmon_dev); 1966 1955 } 1967 1956 1968 1957 #ifdef CONFIG_PM ··· 2030 2057 .name = DRVNAME, 2031 2058 .pm = W83627EHF_DEV_PM_OPS, 2032 2059 }, 2033 - .remove = w83627ehf_remove, 2034 2060 }; 2035 2061 2036 2062 /* w83627ehf_find() looks for a '627 in the Super-I/O config space */