diff mbox series

ethernet: fman: add missing put_device() call in fman_port_probe()

Message ID 1638881746-3215-1-git-send-email-wangqing@vivo.com (mailing list archive)
State Changes Requested
Delegated to: Netdev Maintainers
Headers show
Series ethernet: fman: add missing put_device() call in fman_port_probe() | expand

Checks

Context Check Description
netdev/fixes_present success Fixes tag not required for -next series
netdev/subject_prefix warning Target tree name not specified in the subject
netdev/cover_letter success Single patches do not need cover letters
netdev/patch_count success Link
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit fail Errors and warnings before: 0 this patch: 2
netdev/cc_maintainers success CCed 4 of 4 maintainers
netdev/build_clang fail Errors and warnings before: 0 this patch: 2
netdev/module_param success Was 0 now: 0
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/verify_fixes success No Fixes tag
netdev/build_allmodconfig_warn fail Errors and warnings before: 0 this patch: 2
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 85 lines checked
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0
netdev/tree_selection success Guessing tree name failed - patch did not apply

Commit Message

王擎 Dec. 7, 2021, 12:55 p.m. UTC 
From: Wang Qing <wangqing@vivo.com>

of_find_device_by_node() takes a reference to the embedded struct device 
which needs to be dropped when error return.

Add a jump target to fix the exception handling for this 
function implementation.

Signed-off-by: Wang Qing <wangqing@vivo.com>
---
 drivers/net/ethernet/freescale/fman/fman_port.c | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

Comments

kernel test robot Dec. 7, 2021, 8:36 p.m. UTC | #1 
Hi Qing,

Thank you for the patch! Perhaps something to improve:

[auto build test WARNING on net-next/master]
[also build test WARNING on net/master horms-ipvs/master linus/master v5.16-rc4 next-20211207]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

url:    https://github.com/0day-ci/linux/commits/Qing-Wang/ethernet-fman-add-missing-put_device-call-in-fman_port_probe/20211207-210146
base:   https://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git 1c5526968e270e4efccfa1da21d211a4915cdeda
config: hexagon-buildonly-randconfig-r005-20211207 (https://download.01.org/0day-ci/archive/20211208/202112080417.7Js3IaI3-lkp@intel.com/config)
compiler: clang version 14.0.0 (https://github.com/llvm/llvm-project 097a1cb1d5ebb3a0ec4bcaed8ba3ff6a8e33c00a)
reproduce (this is a W=1 build):
        wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # https://github.com/0day-ci/linux/commit/72dfcb1946c5b8a0eca2806c574922ebbd990b49
        git remote add linux-review https://github.com/0day-ci/linux
        git fetch --no-tags linux-review Qing-Wang/ethernet-fman-add-missing-put_device-call-in-fman_port_probe/20211207-210146
        git checkout 72dfcb1946c5b8a0eca2806c574922ebbd990b49
        # save the config file to linux build tree
        mkdir build_dir
        COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=hexagon SHELL=/bin/bash drivers/net/ethernet/freescale/fman/

If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>

All warnings (new ones prefixed by >>):

>> drivers/net/ethernet/freescale/fman/fman_port.c:1903:1: warning: unused label 'free_port' [-Wunused-label]
   free_port:
   ^~~~~~~~~~
   1 warning generated.


vim +/free_port +1903 drivers/net/ethernet/freescale/fman/fman_port.c

880f874cf50568 Yangbo Lu         2018-06-25  1767  
18a6c85fcc78dd Igal Liberman     2015-12-21  1768  static int fman_port_probe(struct platform_device *of_dev)
18a6c85fcc78dd Igal Liberman     2015-12-21  1769  {
18a6c85fcc78dd Igal Liberman     2015-12-21  1770  	struct fman_port *port;
18a6c85fcc78dd Igal Liberman     2015-12-21  1771  	struct fman *fman;
18a6c85fcc78dd Igal Liberman     2015-12-21  1772  	struct device_node *fm_node, *port_node;
0572054617f326 Florinel Iordache 2020-08-03  1773  	struct platform_device *fm_pdev;
18a6c85fcc78dd Igal Liberman     2015-12-21  1774  	struct resource res;
18a6c85fcc78dd Igal Liberman     2015-12-21  1775  	struct resource *dev_res;
537a31658f8a01 Madalin Bucur     2016-05-16  1776  	u32 val;
18a6c85fcc78dd Igal Liberman     2015-12-21  1777  	int err = 0, lenp;
18a6c85fcc78dd Igal Liberman     2015-12-21  1778  	enum fman_port_type port_type;
18a6c85fcc78dd Igal Liberman     2015-12-21  1779  	u16 port_speed;
18a6c85fcc78dd Igal Liberman     2015-12-21  1780  	u8 port_id;
18a6c85fcc78dd Igal Liberman     2015-12-21  1781  
18a6c85fcc78dd Igal Liberman     2015-12-21  1782  	port = kzalloc(sizeof(*port), GFP_KERNEL);
18a6c85fcc78dd Igal Liberman     2015-12-21  1783  	if (!port)
18a6c85fcc78dd Igal Liberman     2015-12-21  1784  		return -ENOMEM;
18a6c85fcc78dd Igal Liberman     2015-12-21  1785  
18a6c85fcc78dd Igal Liberman     2015-12-21  1786  	port->dev = &of_dev->dev;
18a6c85fcc78dd Igal Liberman     2015-12-21  1787  
18a6c85fcc78dd Igal Liberman     2015-12-21  1788  	port_node = of_node_get(of_dev->dev.of_node);
18a6c85fcc78dd Igal Liberman     2015-12-21  1789  
18a6c85fcc78dd Igal Liberman     2015-12-21  1790  	/* Get the FM node */
18a6c85fcc78dd Igal Liberman     2015-12-21  1791  	fm_node = of_get_parent(port_node);
18a6c85fcc78dd Igal Liberman     2015-12-21  1792  	if (!fm_node) {
18a6c85fcc78dd Igal Liberman     2015-12-21  1793  		dev_err(port->dev, "%s: of_get_parent() failed\n", __func__);
18a6c85fcc78dd Igal Liberman     2015-12-21  1794  		err = -ENODEV;
72dfcb1946c5b8 Wang Qing         2021-12-07  1795  		goto return_of_node_put;
18a6c85fcc78dd Igal Liberman     2015-12-21  1796  	}
18a6c85fcc78dd Igal Liberman     2015-12-21  1797  
0572054617f326 Florinel Iordache 2020-08-03  1798  	fm_pdev = of_find_device_by_node(fm_node);
18a6c85fcc78dd Igal Liberman     2015-12-21  1799  	of_node_put(fm_node);
0572054617f326 Florinel Iordache 2020-08-03  1800  	if (!fm_pdev) {
0572054617f326 Florinel Iordache 2020-08-03  1801  		err = -EINVAL;
72dfcb1946c5b8 Wang Qing         2021-12-07  1802  		goto return_of_node_put;
0572054617f326 Florinel Iordache 2020-08-03  1803  	}
0572054617f326 Florinel Iordache 2020-08-03  1804  
0572054617f326 Florinel Iordache 2020-08-03  1805  	fman = dev_get_drvdata(&fm_pdev->dev);
18a6c85fcc78dd Igal Liberman     2015-12-21  1806  	if (!fman) {
18a6c85fcc78dd Igal Liberman     2015-12-21  1807  		err = -EINVAL;
72dfcb1946c5b8 Wang Qing         2021-12-07  1808  		goto return_of_put_device;
18a6c85fcc78dd Igal Liberman     2015-12-21  1809  	}
18a6c85fcc78dd Igal Liberman     2015-12-21  1810  
537a31658f8a01 Madalin Bucur     2016-05-16  1811  	err = of_property_read_u32(port_node, "cell-index", &val);
537a31658f8a01 Madalin Bucur     2016-05-16  1812  	if (err) {
f7ce91038d5278 Rob Herring       2017-07-18  1813  		dev_err(port->dev, "%s: reading cell-index for %pOF failed\n",
f7ce91038d5278 Rob Herring       2017-07-18  1814  			__func__, port_node);
18a6c85fcc78dd Igal Liberman     2015-12-21  1815  		err = -EINVAL;
72dfcb1946c5b8 Wang Qing         2021-12-07  1816  		goto return_of_put_device;
18a6c85fcc78dd Igal Liberman     2015-12-21  1817  	}
537a31658f8a01 Madalin Bucur     2016-05-16  1818  	port_id = (u8)val;
18a6c85fcc78dd Igal Liberman     2015-12-21  1819  	port->dts_params.id = port_id;
18a6c85fcc78dd Igal Liberman     2015-12-21  1820  
18a6c85fcc78dd Igal Liberman     2015-12-21  1821  	if (of_device_is_compatible(port_node, "fsl,fman-v3-port-tx")) {
18a6c85fcc78dd Igal Liberman     2015-12-21  1822  		port_type = FMAN_PORT_TYPE_TX;
18a6c85fcc78dd Igal Liberman     2015-12-21  1823  		port_speed = 1000;
537a31658f8a01 Madalin Bucur     2016-05-16  1824  		if (of_find_property(port_node, "fsl,fman-10g-port", &lenp))
18a6c85fcc78dd Igal Liberman     2015-12-21  1825  			port_speed = 10000;
18a6c85fcc78dd Igal Liberman     2015-12-21  1826  
18a6c85fcc78dd Igal Liberman     2015-12-21  1827  	} else if (of_device_is_compatible(port_node, "fsl,fman-v2-port-tx")) {
18a6c85fcc78dd Igal Liberman     2015-12-21  1828  		if (port_id >= TX_10G_PORT_BASE)
18a6c85fcc78dd Igal Liberman     2015-12-21  1829  			port_speed = 10000;
18a6c85fcc78dd Igal Liberman     2015-12-21  1830  		else
18a6c85fcc78dd Igal Liberman     2015-12-21  1831  			port_speed = 1000;
18a6c85fcc78dd Igal Liberman     2015-12-21  1832  		port_type = FMAN_PORT_TYPE_TX;
18a6c85fcc78dd Igal Liberman     2015-12-21  1833  
18a6c85fcc78dd Igal Liberman     2015-12-21  1834  	} else if (of_device_is_compatible(port_node, "fsl,fman-v3-port-rx")) {
18a6c85fcc78dd Igal Liberman     2015-12-21  1835  		port_type = FMAN_PORT_TYPE_RX;
18a6c85fcc78dd Igal Liberman     2015-12-21  1836  		port_speed = 1000;
537a31658f8a01 Madalin Bucur     2016-05-16  1837  		if (of_find_property(port_node, "fsl,fman-10g-port", &lenp))
18a6c85fcc78dd Igal Liberman     2015-12-21  1838  			port_speed = 10000;
18a6c85fcc78dd Igal Liberman     2015-12-21  1839  
18a6c85fcc78dd Igal Liberman     2015-12-21  1840  	} else if (of_device_is_compatible(port_node, "fsl,fman-v2-port-rx")) {
18a6c85fcc78dd Igal Liberman     2015-12-21  1841  		if (port_id >= RX_10G_PORT_BASE)
18a6c85fcc78dd Igal Liberman     2015-12-21  1842  			port_speed = 10000;
18a6c85fcc78dd Igal Liberman     2015-12-21  1843  		else
18a6c85fcc78dd Igal Liberman     2015-12-21  1844  			port_speed = 1000;
18a6c85fcc78dd Igal Liberman     2015-12-21  1845  		port_type = FMAN_PORT_TYPE_RX;
18a6c85fcc78dd Igal Liberman     2015-12-21  1846  
18a6c85fcc78dd Igal Liberman     2015-12-21  1847  	}  else {
18a6c85fcc78dd Igal Liberman     2015-12-21  1848  		dev_err(port->dev, "%s: Illegal port type\n", __func__);
18a6c85fcc78dd Igal Liberman     2015-12-21  1849  		err = -EINVAL;
72dfcb1946c5b8 Wang Qing         2021-12-07  1850  		goto return_of_put_device;
18a6c85fcc78dd Igal Liberman     2015-12-21  1851  	}
18a6c85fcc78dd Igal Liberman     2015-12-21  1852  
18a6c85fcc78dd Igal Liberman     2015-12-21  1853  	port->dts_params.type = port_type;
18a6c85fcc78dd Igal Liberman     2015-12-21  1854  	port->dts_params.speed = port_speed;
18a6c85fcc78dd Igal Liberman     2015-12-21  1855  
18a6c85fcc78dd Igal Liberman     2015-12-21  1856  	if (port_type == FMAN_PORT_TYPE_TX) {
18a6c85fcc78dd Igal Liberman     2015-12-21  1857  		u32 qman_channel_id;
18a6c85fcc78dd Igal Liberman     2015-12-21  1858  
18a6c85fcc78dd Igal Liberman     2015-12-21  1859  		qman_channel_id = fman_get_qman_channel_id(fman, port_id);
18a6c85fcc78dd Igal Liberman     2015-12-21  1860  		if (qman_channel_id == 0) {
18a6c85fcc78dd Igal Liberman     2015-12-21  1861  			dev_err(port->dev, "%s: incorrect qman-channel-id\n",
18a6c85fcc78dd Igal Liberman     2015-12-21  1862  				__func__);
18a6c85fcc78dd Igal Liberman     2015-12-21  1863  			err = -EINVAL;
72dfcb1946c5b8 Wang Qing         2021-12-07  1864  			goto return_of_put_device;
18a6c85fcc78dd Igal Liberman     2015-12-21  1865  		}
18a6c85fcc78dd Igal Liberman     2015-12-21  1866  		port->dts_params.qman_channel_id = qman_channel_id;
18a6c85fcc78dd Igal Liberman     2015-12-21  1867  	}
18a6c85fcc78dd Igal Liberman     2015-12-21  1868  
18a6c85fcc78dd Igal Liberman     2015-12-21  1869  	err = of_address_to_resource(port_node, 0, &res);
18a6c85fcc78dd Igal Liberman     2015-12-21  1870  	if (err < 0) {
18a6c85fcc78dd Igal Liberman     2015-12-21  1871  		dev_err(port->dev, "%s: of_address_to_resource() failed\n",
18a6c85fcc78dd Igal Liberman     2015-12-21  1872  			__func__);
18a6c85fcc78dd Igal Liberman     2015-12-21  1873  		err = -ENOMEM;
72dfcb1946c5b8 Wang Qing         2021-12-07  1874  		goto return_of_put_device;
18a6c85fcc78dd Igal Liberman     2015-12-21  1875  	}
18a6c85fcc78dd Igal Liberman     2015-12-21  1876  
18a6c85fcc78dd Igal Liberman     2015-12-21  1877  	port->dts_params.fman = fman;
18a6c85fcc78dd Igal Liberman     2015-12-21  1878  
18a6c85fcc78dd Igal Liberman     2015-12-21  1879  	dev_res = __devm_request_region(port->dev, &res, res.start,
18a6c85fcc78dd Igal Liberman     2015-12-21  1880  					resource_size(&res), "fman-port");
18a6c85fcc78dd Igal Liberman     2015-12-21  1881  	if (!dev_res) {
18a6c85fcc78dd Igal Liberman     2015-12-21  1882  		dev_err(port->dev, "%s: __devm_request_region() failed\n",
18a6c85fcc78dd Igal Liberman     2015-12-21  1883  			__func__);
18a6c85fcc78dd Igal Liberman     2015-12-21  1884  		err = -EINVAL;
72dfcb1946c5b8 Wang Qing         2021-12-07  1885  		goto return_of_put_device;
18a6c85fcc78dd Igal Liberman     2015-12-21  1886  	}
18a6c85fcc78dd Igal Liberman     2015-12-21  1887  
18a6c85fcc78dd Igal Liberman     2015-12-21  1888  	port->dts_params.base_addr = devm_ioremap(port->dev, res.start,
18a6c85fcc78dd Igal Liberman     2015-12-21  1889  						  resource_size(&res));
5df6f7fa47e030 Madalin Bucur     2016-03-22  1890  	if (!port->dts_params.base_addr)
18a6c85fcc78dd Igal Liberman     2015-12-21  1891  		dev_err(port->dev, "%s: devm_ioremap() failed\n", __func__);
18a6c85fcc78dd Igal Liberman     2015-12-21  1892  
72dfcb1946c5b8 Wang Qing         2021-12-07  1893  	of_node_put(port_node);
72dfcb1946c5b8 Wang Qing         2021-12-07  1894  
18a6c85fcc78dd Igal Liberman     2015-12-21  1895  	dev_set_drvdata(&of_dev->dev, port);
18a6c85fcc78dd Igal Liberman     2015-12-21  1896  
18a6c85fcc78dd Igal Liberman     2015-12-21  1897  	return 0;
18a6c85fcc78dd Igal Liberman     2015-12-21  1898  
72dfcb1946c5b8 Wang Qing         2021-12-07  1899  return_of_put_device:
72dfcb1946c5b8 Wang Qing         2021-12-07  1900  	put_device(&fm_pdev->dev);
72dfcb1946c5b8 Wang Qing         2021-12-07  1901  return_of_node_put:
18a6c85fcc78dd Igal Liberman     2015-12-21  1902  	of_node_put(port_node);
18a6c85fcc78dd Igal Liberman     2015-12-21 @1903  free_port:
18a6c85fcc78dd Igal Liberman     2015-12-21  1904  	kfree(port);
18a6c85fcc78dd Igal Liberman     2015-12-21  1905  	return err;
18a6c85fcc78dd Igal Liberman     2015-12-21  1906  }
18a6c85fcc78dd Igal Liberman     2015-12-21  1907  

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
diff mbox series

Patch

diff --git a/drivers/net/ethernet/freescale/fman/fman_port.c b/drivers/net/ethernet/freescale/fman/fman_port.c
index d9baac0..7643c5c
--- a/drivers/net/ethernet/freescale/fman/fman_port.c
+++ b/drivers/net/ethernet/freescale/fman/fman_port.c
@@ -1792,20 +1792,20 @@  static int fman_port_probe(struct platform_device *of_dev)
 	if (!fm_node) {
 		dev_err(port->dev, "%s: of_get_parent() failed\n", __func__);
 		err = -ENODEV;
-		goto return_err;
+		goto return_of_node_put;
 	}
 
 	fm_pdev = of_find_device_by_node(fm_node);
 	of_node_put(fm_node);
 	if (!fm_pdev) {
 		err = -EINVAL;
-		goto return_err;
+		goto return_of_node_put;
 	}
 
 	fman = dev_get_drvdata(&fm_pdev->dev);
 	if (!fman) {
 		err = -EINVAL;
-		goto return_err;
+		goto return_of_put_device;
 	}
 
 	err = of_property_read_u32(port_node, "cell-index", &val);
@@ -1813,7 +1813,7 @@  static int fman_port_probe(struct platform_device *of_dev)
 		dev_err(port->dev, "%s: reading cell-index for %pOF failed\n",
 			__func__, port_node);
 		err = -EINVAL;
-		goto return_err;
+		goto return_of_put_device;
 	}
 	port_id = (u8)val;
 	port->dts_params.id = port_id;
@@ -1847,7 +1847,7 @@  static int fman_port_probe(struct platform_device *of_dev)
 	}  else {
 		dev_err(port->dev, "%s: Illegal port type\n", __func__);
 		err = -EINVAL;
-		goto return_err;
+		goto return_of_put_device;
 	}
 
 	port->dts_params.type = port_type;
@@ -1861,7 +1861,7 @@  static int fman_port_probe(struct platform_device *of_dev)
 			dev_err(port->dev, "%s: incorrect qman-channel-id\n",
 				__func__);
 			err = -EINVAL;
-			goto return_err;
+			goto return_of_put_device;
 		}
 		port->dts_params.qman_channel_id = qman_channel_id;
 	}
@@ -1871,20 +1871,18 @@  static int fman_port_probe(struct platform_device *of_dev)
 		dev_err(port->dev, "%s: of_address_to_resource() failed\n",
 			__func__);
 		err = -ENOMEM;
-		goto return_err;
+		goto return_of_put_device;
 	}
 
 	port->dts_params.fman = fman;
 
-	of_node_put(port_node);
-
 	dev_res = __devm_request_region(port->dev, &res, res.start,
 					resource_size(&res), "fman-port");
 	if (!dev_res) {
 		dev_err(port->dev, "%s: __devm_request_region() failed\n",
 			__func__);
 		err = -EINVAL;
-		goto free_port;
+		goto return_of_put_device;
 	}
 
 	port->dts_params.base_addr = devm_ioremap(port->dev, res.start,
@@ -1892,11 +1890,15 @@  static int fman_port_probe(struct platform_device *of_dev)
 	if (!port->dts_params.base_addr)
 		dev_err(port->dev, "%s: devm_ioremap() failed\n", __func__);
 
+	of_node_put(port_node);
+
 	dev_set_drvdata(&of_dev->dev, port);
 
 	return 0;
 
-return_err:
+return_of_put_device:
+	put_device(&fm_pdev->dev);
+return_of_node_put:
 	of_node_put(port_node);
 free_port:
 	kfree(port);