From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1D065C433F5 for ; Mon, 11 Apr 2022 19:21:16 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0BBE483E01; Mon, 11 Apr 2022 21:21:11 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="AOrJrkJ9"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6CD7983E3D; Mon, 11 Apr 2022 21:21:07 +0200 (CEST) Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 0722783E30 for ; Mon, 11 Apr 2022 21:21:03 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=kabel@kernel.org Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 9F687614FF; Mon, 11 Apr 2022 19:21:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B256FC385A6; Mon, 11 Apr 2022 19:20:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1649704861; bh=ANFqv7G7z+3N4A0RzJsimkOtHvHrgMgwoiN+a9ecns8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AOrJrkJ9GU226+4jzoZmGH1wLSI9uUUnQl4GBxSE9kaU8GQ5Ig7g6jlXcytum9YTI k+X6smYd5wOPfm/rL1DIsrlH5Bi4nWBHLctn3cPcPEUNPwl20N1dmwbU4qrVa+kOou j4owQ7lZFRkAUBnYogm8yXSF3a6brUW0aFiOv/KN1an6Too6WnyYTEplXblwtudXE7 xWMjFYxaj896cidrL63JsQy8wpiZWjz6QcPpo4yE1zkPER93cJ/tCsDyGxEP+1k/hE 36KEhphxsJuBgcrQBRfzGCy0EVEpiZcGm/Ixzj3d3Ja1adkmsROXvCbJRhjt7Zn37g rBiYcubapFcRg== From: =?UTF-8?q?Marek=20Beh=C3=BAn?= To: Ramon Fried Cc: Joe Hershberger , u-boot@lists.denx.de, =?UTF-8?q?Marek=20Beh=C3=BAn?= , Grygorii Strashko , Murali Karicheri Subject: [PATCH u-boot-net 1/3] driver: net: ti: keystone_net: Deduplicate code Date: Mon, 11 Apr 2022 21:20:53 +0200 Message-Id: <20220411192055.31080-2-kabel@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220411192055.31080-1-kabel@kernel.org> References: <20220411192055.31080-1-kabel@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean From: Marek Behún Deduplicate common code in ks2_eth_bind_slaves(). Signed-off-by: Marek Behún --- drivers/net/ti/keystone_net.c | 75 ++++++++++++++++------------------- 1 file changed, 34 insertions(+), 41 deletions(-) diff --git a/drivers/net/ti/keystone_net.c b/drivers/net/ti/keystone_net.c index 16e3f32bb0..3ee4740ec5 100644 --- a/drivers/net/ti/keystone_net.c +++ b/drivers/net/ti/keystone_net.c @@ -621,58 +621,51 @@ static const struct eth_ops ks2_eth_ops = { .write_hwaddr = ks2_eth_write_hwaddr, }; -static int ks2_eth_bind_slaves(struct udevice *dev, int gbe, int *gbe_0) +static int ks2_bind_one_slave(struct udevice *dev, int slave, int *gbe_0) { const void *fdt = gd->fdt_blob; - struct udevice *sl_dev; - int interfaces; - int sec_slave; - int slave; - int ret; char *slave_name; + int slave_no; + int ret; + + slave_no = fdtdec_get_int(fdt, slave, "slave-port", -ENOENT); + if (slave_no == -ENOENT) + return 0; + + if (gbe_0 && slave_no == 0) { + /* This is the current eth device */ + *gbe_0 = slave; + return 0; + } + + /* Slave devices to be registered */ + slave_name = malloc(20); + snprintf(slave_name, 20, "netcp@slave-%d", slave_no); + ret = device_bind_driver_to_node(dev, "eth_ks2_sl", slave_name, + offset_to_ofnode(slave), NULL); + if (ret) + pr_err("ks2_net - not able to bind slave interfaces\n"); + + return ret; +} + +static int ks2_eth_bind_slaves(struct udevice *dev, int gbe, int *gbe_0) +{ + int interfaces, sec_slave, slave, ret; + const void *fdt = gd->fdt_blob; interfaces = fdt_subnode_offset(fdt, gbe, "interfaces"); fdt_for_each_subnode(slave, fdt, interfaces) { - int slave_no; - - slave_no = fdtdec_get_int(fdt, slave, "slave-port", -ENOENT); - if (slave_no == -ENOENT) - continue; - - if (slave_no == 0) { - /* This is the current eth device */ - *gbe_0 = slave; - } else { - /* Slave devices to be registered */ - slave_name = malloc(20); - snprintf(slave_name, 20, "netcp@slave-%d", slave_no); - ret = device_bind_driver_to_node(dev, "eth_ks2_sl", - slave_name, offset_to_ofnode(slave), - &sl_dev); - if (ret) { - pr_err("ks2_net - not able to bind slave interfaces\n"); - return ret; - } - } + ret = ks2_bind_one_slave(dev, slave, gbe_0); + if (ret) + return ret; } sec_slave = fdt_subnode_offset(fdt, gbe, "secondary-slave-ports"); fdt_for_each_subnode(slave, fdt, sec_slave) { - int slave_no; - - slave_no = fdtdec_get_int(fdt, slave, "slave-port", -ENOENT); - if (slave_no == -ENOENT) - continue; - - /* Slave devices to be registered */ - slave_name = malloc(20); - snprintf(slave_name, 20, "netcp@slave-%d", slave_no); - ret = device_bind_driver_to_node(dev, "eth_ks2_sl", slave_name, - offset_to_ofnode(slave), &sl_dev); - if (ret) { - pr_err("ks2_net - not able to bind slave interfaces\n"); + ret = ks2_bind_one_slave(dev, slave, NULL); + if (ret) return ret; - } } return 0; -- 2.35.1