From patchwork Fri Sep 2 21:57:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 12964750 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3EDD9ECAAA1 for ; Fri, 2 Sep 2022 22:02:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ri3OX8TE/EHxE1BldAHWUrHvtu98HbJyFdHfzpQd5/c=; b=T1wGtsURoX00Ea ACMb7gtGUGtHACWu6WUHDNxBDKQUDxdzGEiwhPKNR0nDmh0s/rrbJTBcQ43SJpqzGMqSn57YrmsIp fYl5nXwAT19r5YIzLaxT3/k0NH9pV2JRz7Y9mpGCUYnbKt4j8r6/HZmQxqURrbBtlrVv69wZy4VwZ iXPBCmoLh+rJ+tWckoBfnwz3MUNJPCbSlGxnycTCKLe+YxAx+Af+a//ElkocykvlEgQrm7mDn/23A u7WxdAVU2G/IDtbuv/Lm73hGyK9z3nCW4fqysa1x8/JFdOJ2VuOo3O+yp8soWxyoCMud5oDihAAW6 aWXJImEHLTdHt6lso8bA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oUEiP-00Bgaf-LO; Fri, 02 Sep 2022 22:00:44 +0000 Received: from mail-eopbgr150089.outbound.protection.outlook.com ([40.107.15.89] helo=EUR01-DB5-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oUEfv-00Bdr6-3r for linux-arm-kernel@lists.infradead.org; Fri, 02 Sep 2022 21:58:09 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ny7IejYpH9A/FlJa8KWMFWwFF+a1wko+/zzZ3omGpxvKETvoXTwJ6mN9nA2qDwXATUQ+pqUCQa0a7U7Ik3SU67lQ8ID/sFahWQewRTdc2/J42vorzwHprQFnZgV2POeTdgIjQWDkxRbBwo3sMb3xON9SmpQ+Yns2ahtHvKn6IeyIRi901/NSO/SqRLVNOo13yyP4I/5ArV/BnJ6WdaqtTO5Xvhf5wHlF4kV7a8fO2SZgGaOJylhbLcD9tIqc/gNHBB8PE7Bn/oTkqQct6KacvDAN2/MdEO4vBi1x/meEBegj2YRBQq3p8yVUQu02vmqeH+NigjnvHjvfV1/OhefXxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=/KuhusnLjiLJbej+rFDCuxZxkk1q2MwlbFKv7ZvUD2s=; b=kc/j/ysprd4ewzAvSdoP37l+e8o+DUwKEOho8f3fctODIsNJNCnjRbqIPlkA/X2l7yPTcmyIIOmMcAg4X1FFNZDE7LLeLMEwwo9zo9J9qMPsoEQ65n9V70ZBVOUXRiW/Q04XBkjjk7KathPcSY8znr0rJNDl58dBrUGbywhSUqI7Qsma2pjgXZzCVXyDjHWjCBaBRknMhfTUkHzfoxOZ5shAgi4fbuj84xEkpUlVsQxKrohn+77UV141tC6xDhfNi2OMcKppYM883LjUYEK9heQSLF6sCVP48n4QXMvy/74NS0k+4Ufc4j3fm9Xzg430HRiwW0LuOsY2Er25peR1cw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=seco.com; dmarc=pass action=none header.from=seco.com; dkim=pass header.d=seco.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=seco.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/KuhusnLjiLJbej+rFDCuxZxkk1q2MwlbFKv7ZvUD2s=; b=gLrXOfGJcBuLy6S1uSFsZuP3neYjVwf4IxDwa+1wf3uO0wDn38DxcdvhNCOQr+ovxTFp4lm2Ty/0x9Own52NdxJgRLORjjVdNXHYIpNub/XhrfUbVjpZlrjdaWjclcYiXdVlUAchQbJ9bAYvSwAvf6puI7MrNvwE4nlRvNoAashi3xn+VYsmrf76P1swRAe07VDaBLqokk/UiB34XPg1LihCnUME40kOTgp9JsWmCzrhOi+3eaC6IKtPXIZGVb7m+jwoYwSEkC86tpk3NOTQDJjcIfNml4pP9jcgFT2/ePibmXruA97Flt+LYI3zQp2L0hyd+AvTmMTaWZM8r7CnQA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=seco.com; Received: from DB7PR03MB4972.eurprd03.prod.outlook.com (2603:10a6:10:7d::22) by AM6PR03MB4085.eurprd03.prod.outlook.com (2603:10a6:20b:1b::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.14; Fri, 2 Sep 2022 21:58:01 +0000 Received: from DB7PR03MB4972.eurprd03.prod.outlook.com ([fe80::ecaa:a5a9:f0d5:27a2]) by DB7PR03MB4972.eurprd03.prod.outlook.com ([fe80::ecaa:a5a9:f0d5:27a2%4]) with mapi id 15.20.5566.019; Fri, 2 Sep 2022 21:58:01 +0000 From: Sean Anderson To: "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , netdev@vger.kernel.org Cc: Camelia Groza , Madalin Bucur , linux-kernel@vger.kernel.org (open list), linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, Sean Anderson Subject: [PATCH net-next v5 06/14] net: fman: Pass params directly to mac init Date: Fri, 2 Sep 2022 17:57:28 -0400 Message-Id: <20220902215737.981341-7-sean.anderson@seco.com> X-Mailer: git-send-email 2.35.1.1320.gc452695387.dirty In-Reply-To: <20220902215737.981341-1-sean.anderson@seco.com> References: <20220902215737.981341-1-sean.anderson@seco.com> X-ClientProxiedBy: CH0PR03CA0315.namprd03.prod.outlook.com (2603:10b6:610:118::15) To DB7PR03MB4972.eurprd03.prod.outlook.com (2603:10a6:10:7d::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4c6f6146-c44a-4d52-9948-08da8d2e340d X-MS-TrafficTypeDiagnostic: AM6PR03MB4085:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RtxAULMkJ7CFbifOZQXGACljz9AmK2XORqWj9u7MeI2KIID7OYl2RrW47k7DR/IhlWQZYbNUKJgaP84z/mEBXXOpwzyFYYPMUSsb3/KtjECHRpC8X5GpAKb2DJ5SHzh41oSDAFlV0xiiVXoljGtG6LlcFnyERVdCoi1kOE5iF3qp8CiT97oAtAaR9w3QTfAnKqAQWIZJtR1HjMqinsaPP73Cl0WjrpdnRSfL7nQpxwR06yqZ/cfvUFPdSmPvvv0HjDzwFDxErdpAWjvo8XDkacWiUR6iu/Lic+kyH3e3N5/g/kSGp7dDXwL+l8UQ7t8ZFuwXRPyjYbyczYsvpU6JpC3aEpPESD5t66g/hMgYlSgikFa8DKB9H9YN3ipP56RlWhfAYeeaoeRsZ7qp9UDXZak6BrBGX8nmBV9R8D2gVlVLJ4O0MmbY4DnH+ICh2lCfLihJ/vwJhuHNBwXGe+d8RlEVdVDB41W1YrDArLjjZbDawsrsjw3J6CN0gBq1i3Ta9sviXW6Wz3KaD8MXZCq811V+81XO0fRz8dTRsaROT5lW/cPhcL9PtD0YsIWBFeJFWT2wqDDVnDnnGzRX4FaLfy6S4HzOfNevXKEyZkzoi/Wjyoa8l5ZVbS6m9HO7Y9Q1HaOQCrW4Lv7w0hCgsMAUStYWoLdMqm26wRzbpL7olDB93DKwA8mRrD89QtcuZwUbUa7lhJnhmyg2cL0+liRcP3ulD9t63aO1ZE8YQkuRfjkfxHTxz8voE8KIbTqaUyqRjkGwkktbgQXrCov48PEhfg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DB7PR03MB4972.eurprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(39850400004)(136003)(346002)(376002)(396003)(366004)(6506007)(6512007)(26005)(2616005)(186003)(1076003)(7416002)(44832011)(52116002)(8936002)(5660300002)(86362001)(6486002)(41300700001)(6666004)(107886003)(478600001)(83380400001)(36756003)(2906002)(4326008)(8676002)(110136005)(316002)(38350700002)(38100700002)(66476007)(54906003)(66946007)(66556008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: KMtX7lA8lcL4+RvNJkGipLfVwy4rSODfPwXXTNuCjRjZFo/Qsv01wyjcTAcw17uvrL8wWgs076cWU3ytBkdV9Z0omiJeM+U3DM1OVeDeeNEwMFLVII2aM/MnB8QNDc4NFt4XHeUMOmTtV3PZDayD+ZQCpnKJgC9S9RFFZSQy3Zpo6ATOA17JN5rrpKThv34roRxAT3Mu/bQjuH2qXUzbHOiD9LB4m8jn8B83gxQW3j3YQewl0gi9iGHXiBEUmgT4bJazVRs2qJWx3FyyZlQbgUNCSBWspZpceJr6H6fJZQWdVy5JYoCKyE1jx2X6XYl5tDGeFwj1dq/y4+wQySKJyvsWoGQEuoIB86uhsiwdHZFddaV8ZoB05OSbkzTbJlZKmaN3fp0Ktkar864FhdN70XN9oAtU2BQtOqQbFpo7NGA/YPtR0aIC5GyLvVXSpYtHqnncOH49eu0Tkjz89L4SlTe7JQdgHlPfS0lrowZAleaNp29SruqylRJQOoYl2aLWrL8pbLcQA3bzCPn+VTYSIqQvDCaHCz50jq2bnlSY82AKZCJcBMJYmAaL9dhV2Sp4X6Xk0ns8VMTBVxlHJ8W+Bgj9CeUnwAv/AM1/GG7gWPH4BZSjD+4Sr0rOWxIh6bUxlnxWM7vqHKi/9YDf7Q7AcLPWEpQKnJikRY8vkxemysI0POWv4togi/NwJCr6N7TdvSUxwn5fNaWxWCIxE0TNqdSAshJ3B9yJOhd+MUwG6EZNCSJjGtDuRMVzFVEbWUHkD46BF48Ddq7h09L9/HLkxw5evDOwvnO+a/aYi4K+Vjjoz5EORP2YgnQxvyH9ZOvxUW50iVVXp2tuA0EhuUx2R0og/swNeS/avRV4MkWiiJRiaVx4mjwK+3tTmyB7Lh7Hq5FvEGUnGsg05xViaYMwSF86E8evdGUhtM+APhnzKER1MVjUp5LsYGR0a8fwytSS2AMbX4uyCGx0uQXXfBJP1SK7M9amhbctAguu3pS53aEr7JZotA8fHnpR7OARFpX9j7+7uWb9Iz3u4BAjQpvkCmQ5oSUhdgCbh5UnqvJAB9SpUuJHzpDft1K+kqdJ+i++t5UE/CvABXLiFjR7aQhjae2DhyWUgxn9z9NdxFBifJcx4hbwdFlGn20/YV7RwI2aXrvVtaFiwug0nNigU41jSqXvQLQodsc7w/nh8uQRvj5CNWEd4GEbjkZX+wdx6kJblySQbGHmi0mQ65gZLsh4mrVmNQ6/BO+NAWRwEBmR8b6Tth0vYGkIyc5ZveeLZufQmRH3cUDapc9muv7NTdWPigEr40dyNlauynr0t+cIXELD6f+BYWkCpvip2Ia0+KkFNF/eRg9ZNOpS8Dys5oMn81C/kuh5NdS8XV+IfuSYRp5JQtYZi6J103tCNX3MO6ugO+RwJZUeOIR/GO0MZLR3p/bnVyl1FZEJqm9lW6fogUH2JeSNCWvN7PFyE/0H1fp0wkAVFP/SbIOwrVf5hP19grstIVQAj/Gc1caKezkviOrMK0rR+lP8NkTJRU6gVclheOoyFYLXmBykpJvx1+ZTeG+LT8bNTvl2sdpBEeSjotu/Dee/xDxntiquFrlGA6fHoxTs1M5p57K2uik/K8o73Q== X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4c6f6146-c44a-4d52-9948-08da8d2e340d X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4972.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Sep 2022 21:58:00.9696 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Csg2msrxrYLD4PBMBOxFHaLZUWY2Ra8TLp3kUmOCCsn2Ml03zZaN0zw6nE4dRs3b3VH9D1EFwCMzEhi77rBcSA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR03MB4085 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220902_145807_314251_91B52305 X-CRM114-Status: GOOD ( 15.01 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Instead of having the mac init functions call back into the fman core to get their params, just pass them directly to the init functions. Signed-off-by: Sean Anderson Acked-by: Camelia Groza --- (no changes since v1) .../net/ethernet/freescale/fman/fman_dtsec.c | 10 ++---- .../net/ethernet/freescale/fman/fman_dtsec.h | 3 +- .../net/ethernet/freescale/fman/fman_memac.c | 14 +++----- .../net/ethernet/freescale/fman/fman_memac.h | 3 +- .../net/ethernet/freescale/fman/fman_tgec.c | 10 ++---- .../net/ethernet/freescale/fman/fman_tgec.h | 3 +- drivers/net/ethernet/freescale/fman/mac.c | 36 ++++++++----------- drivers/net/ethernet/freescale/fman/mac.h | 2 -- 8 files changed, 32 insertions(+), 49 deletions(-) diff --git a/drivers/net/ethernet/freescale/fman/fman_dtsec.c b/drivers/net/ethernet/freescale/fman/fman_dtsec.c index c2c4677451a9..9fabb2dfc972 100644 --- a/drivers/net/ethernet/freescale/fman/fman_dtsec.c +++ b/drivers/net/ethernet/freescale/fman/fman_dtsec.c @@ -1474,10 +1474,10 @@ static struct fman_mac *dtsec_config(struct fman_mac_params *params) } int dtsec_initialization(struct mac_device *mac_dev, - struct device_node *mac_node) + struct device_node *mac_node, + struct fman_mac_params *params) { int err; - struct fman_mac_params params; struct fman_mac *dtsec; struct device_node *phy_node; @@ -1495,11 +1495,7 @@ int dtsec_initialization(struct mac_device *mac_dev, mac_dev->enable = dtsec_enable; mac_dev->disable = dtsec_disable; - err = set_fman_mac_params(mac_dev, ¶ms); - if (err) - goto _return; - - mac_dev->fman_mac = dtsec_config(¶ms); + mac_dev->fman_mac = dtsec_config(params); if (!mac_dev->fman_mac) { err = -EINVAL; goto _return; diff --git a/drivers/net/ethernet/freescale/fman/fman_dtsec.h b/drivers/net/ethernet/freescale/fman/fman_dtsec.h index cf3e683c089c..8c72d280c51a 100644 --- a/drivers/net/ethernet/freescale/fman/fman_dtsec.h +++ b/drivers/net/ethernet/freescale/fman/fman_dtsec.h @@ -11,6 +11,7 @@ struct mac_device; int dtsec_initialization(struct mac_device *mac_dev, - struct device_node *mac_node); + struct device_node *mac_node, + struct fman_mac_params *params); #endif /* __DTSEC_H */ diff --git a/drivers/net/ethernet/freescale/fman/fman_memac.c b/drivers/net/ethernet/freescale/fman/fman_memac.c index 19c2d657c41a..5daa8c7626f4 100644 --- a/drivers/net/ethernet/freescale/fman/fman_memac.c +++ b/drivers/net/ethernet/freescale/fman/fman_memac.c @@ -1154,11 +1154,11 @@ static struct fman_mac *memac_config(struct fman_mac_params *params) } int memac_initialization(struct mac_device *mac_dev, - struct device_node *mac_node) + struct device_node *mac_node, + struct fman_mac_params *params) { int err; struct device_node *phy_node; - struct fman_mac_params params; struct fixed_phy_status *fixed_link; struct fman_mac *memac; @@ -1176,14 +1176,10 @@ int memac_initialization(struct mac_device *mac_dev, mac_dev->enable = memac_enable; mac_dev->disable = memac_disable; - err = set_fman_mac_params(mac_dev, ¶ms); - if (err) - goto _return; + if (params->max_speed == SPEED_10000) + params->phy_if = PHY_INTERFACE_MODE_XGMII; - if (params.max_speed == SPEED_10000) - params.phy_if = PHY_INTERFACE_MODE_XGMII; - - mac_dev->fman_mac = memac_config(¶ms); + mac_dev->fman_mac = memac_config(params); if (!mac_dev->fman_mac) { err = -EINVAL; goto _return; diff --git a/drivers/net/ethernet/freescale/fman/fman_memac.h b/drivers/net/ethernet/freescale/fman/fman_memac.h index a58215a3b1d9..5a3a14f9684f 100644 --- a/drivers/net/ethernet/freescale/fman/fman_memac.h +++ b/drivers/net/ethernet/freescale/fman/fman_memac.h @@ -14,6 +14,7 @@ struct mac_device; int memac_initialization(struct mac_device *mac_dev, - struct device_node *mac_node); + struct device_node *mac_node, + struct fman_mac_params *params); #endif /* __MEMAC_H */ diff --git a/drivers/net/ethernet/freescale/fman/fman_tgec.c b/drivers/net/ethernet/freescale/fman/fman_tgec.c index 32ee1674ff2f..f34f89e46a6f 100644 --- a/drivers/net/ethernet/freescale/fman/fman_tgec.c +++ b/drivers/net/ethernet/freescale/fman/fman_tgec.c @@ -783,10 +783,10 @@ static struct fman_mac *tgec_config(struct fman_mac_params *params) } int tgec_initialization(struct mac_device *mac_dev, - struct device_node *mac_node) + struct device_node *mac_node, + struct fman_mac_params *params) { int err; - struct fman_mac_params params; struct fman_mac *tgec; mac_dev->set_promisc = tgec_set_promiscuous; @@ -803,11 +803,7 @@ int tgec_initialization(struct mac_device *mac_dev, mac_dev->enable = tgec_enable; mac_dev->disable = tgec_disable; - err = set_fman_mac_params(mac_dev, ¶ms); - if (err) - goto _return; - - mac_dev->fman_mac = tgec_config(¶ms); + mac_dev->fman_mac = tgec_config(params); if (!mac_dev->fman_mac) { err = -EINVAL; goto _return; diff --git a/drivers/net/ethernet/freescale/fman/fman_tgec.h b/drivers/net/ethernet/freescale/fman/fman_tgec.h index 2e45b9fea352..768b8d165e05 100644 --- a/drivers/net/ethernet/freescale/fman/fman_tgec.h +++ b/drivers/net/ethernet/freescale/fman/fman_tgec.h @@ -11,6 +11,7 @@ struct mac_device; int tgec_initialization(struct mac_device *mac_dev, - struct device_node *mac_node); + struct device_node *mac_node, + struct fman_mac_params *params); #endif /* __TGEC_H */ diff --git a/drivers/net/ethernet/freescale/fman/mac.c b/drivers/net/ethernet/freescale/fman/mac.c index 62af81c0c942..fb04c1f9cd3e 100644 --- a/drivers/net/ethernet/freescale/fman/mac.c +++ b/drivers/net/ethernet/freescale/fman/mac.c @@ -57,25 +57,6 @@ static void mac_exception(void *handle, enum fman_mac_exceptions ex) __func__, ex); } -int set_fman_mac_params(struct mac_device *mac_dev, - struct fman_mac_params *params) -{ - struct mac_priv_s *priv = mac_dev->priv; - - params->base_addr = mac_dev->vaddr; - memcpy(¶ms->addr, mac_dev->addr, sizeof(mac_dev->addr)); - params->max_speed = priv->max_speed; - params->phy_if = mac_dev->phy_if; - params->basex_if = false; - params->mac_id = priv->cell_index; - params->fm = (void *)priv->fman; - params->exception_cb = mac_exception; - params->event_cb = mac_exception; - params->dev_id = mac_dev; - - return 0; -} - int fman_set_multi(struct net_device *net_dev, struct mac_device *mac_dev) { struct mac_priv_s *priv; @@ -294,13 +275,15 @@ MODULE_DEVICE_TABLE(of, mac_match); static int mac_probe(struct platform_device *_of_dev) { int err, i, nph; - int (*init)(struct mac_device *mac_dev, struct device_node *mac_node); + int (*init)(struct mac_device *mac_dev, struct device_node *mac_node, + struct fman_mac_params *params); struct device *dev; struct device_node *mac_node, *dev_node; struct mac_device *mac_dev; struct platform_device *of_dev; struct resource *res; struct mac_priv_s *priv; + struct fman_mac_params params; u32 val; u8 fman_id; phy_interface_t phy_if; @@ -474,7 +457,18 @@ static int mac_probe(struct platform_device *_of_dev) /* Get the rest of the PHY information */ mac_dev->phy_node = of_parse_phandle(mac_node, "phy-handle", 0); - err = init(mac_dev, mac_node); + params.base_addr = mac_dev->vaddr; + memcpy(¶ms.addr, mac_dev->addr, sizeof(mac_dev->addr)); + params.max_speed = priv->max_speed; + params.phy_if = mac_dev->phy_if; + params.basex_if = false; + params.mac_id = priv->cell_index; + params.fm = (void *)priv->fman; + params.exception_cb = mac_exception; + params.event_cb = mac_exception; + params.dev_id = mac_dev; + + err = init(mac_dev, mac_node, ¶ms); if (err < 0) { dev_err(dev, "mac_dev->init() = %d\n", err); of_node_put(mac_dev->phy_node); diff --git a/drivers/net/ethernet/freescale/fman/mac.h b/drivers/net/ethernet/freescale/fman/mac.h index 7aa71b05bd3e..c5fb4d46210f 100644 --- a/drivers/net/ethernet/freescale/fman/mac.h +++ b/drivers/net/ethernet/freescale/fman/mac.h @@ -72,8 +72,6 @@ int fman_set_mac_active_pause(struct mac_device *mac_dev, bool rx, bool tx); void fman_get_pause_cfg(struct mac_device *mac_dev, bool *rx_pause, bool *tx_pause); -int set_fman_mac_params(struct mac_device *mac_dev, - struct fman_mac_params *params); int fman_set_multi(struct net_device *net_dev, struct mac_device *mac_dev); #endif /* __MAC_H */