From patchwork Mon Dec 7 21:40:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 7791281 X-Patchwork-Delegate: horms@verge.net.au Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B742CBEEE1 for ; Mon, 7 Dec 2015 21:40:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DFD132052F for ; Mon, 7 Dec 2015 21:40:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0BCD2204FB for ; Mon, 7 Dec 2015 21:40:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756031AbbLGVkY (ORCPT ); Mon, 7 Dec 2015 16:40:24 -0500 Received: from mail-lf0-f51.google.com ([209.85.215.51]:33756 "EHLO mail-lf0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756015AbbLGVkW (ORCPT ); Mon, 7 Dec 2015 16:40:22 -0500 Received: by lfaz4 with SMTP id z4so355755lfa.0 for ; Mon, 07 Dec 2015 13:40:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cogentembedded-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:organization:user-agent :in-reply-to:references:mime-version:content-transfer-encoding :content-type; bh=MszTagd70uKjpZOq9AFfEWu9dlDTOaFEuaRlkY0C8SA=; b=nGx605rz96c+Pxk3NFxnUN/x+uzhFKawcQTuZqD3VskqBCmkE3MQDrFeyXzuePGbd3 /9PRIRED/Ge6g65uBvFMDcs5ICp92q6UACBIct7aXlcOdbuk39OjN4G3mKFwBpCpQu1V d5Ncy0Sy3e5KEsbUcUd72fZK7u9Q91ur0SfRzrAor7mvde1z5BwZ2Ts2G/TIOPHBRTr7 A84wUU4ogU+N8IsGbe6HyHLHVMHBlpKiFIlr3lP6oERhjaA1jrbjUgav6k7W19GfvKfy /LJcqvBMLhKezZ7nNPZsKtLWRozv1+6kzQYf96JAOPj/QF6uFPU1edGTBj8tUJM1K3Jj vPkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:organization :user-agent:in-reply-to:references:mime-version :content-transfer-encoding:content-type; bh=MszTagd70uKjpZOq9AFfEWu9dlDTOaFEuaRlkY0C8SA=; b=E32vp3PpKVsz3Oomsws/fycCGIU+KP59WpQiYiw+1LrRoGDFHfpoZpFpKRbMMJK5Qz G3OiM2sX710kLXA+HfH1g5nlRTB77XHaRxLC12nGIJbH+A28Kj7z3RHA+Wf1/ZdZA9UM 0KXCkpOpeT4q1g89jNvyoKe0mnda+zV0onQuydAjfPip88st0IB3sSMVbW9xQJZEdbLp 2v8xtGRySQyE8W3rFND/DwOk7U6dRVEZXYocqv5sHLEvTbgGMf4aSJBOzjsFFZT5Wt8Y KU7utuZjhI5iANZZaQPvWjdio00U9gZgr/eUP1YINreADY+/xRASNx6N9svcSzTKvUs6 Wvig== X-Gm-Message-State: ALoCoQmFzR5/FfMr2H3YBhLl98nVpC2sbNMGjg8xjGUzgyNGxQLoVw1R11Ew9BevX9NmMT8OOZ3lXULnfdJ3mrk7AlAXHN4CVA== X-Received: by 10.25.163.133 with SMTP id m127mr4705lfe.0.1449524421322; Mon, 07 Dec 2015 13:40:21 -0800 (PST) Received: from wasted.cogentembedded.com ([31.173.81.16]) by smtp.gmail.com with ESMTPSA id um1sm661lbb.23.2015.12.07.13.40.20 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 07 Dec 2015 13:40:20 -0800 (PST) From: Sergei Shtylyov To: netdev@vger.kernel.org Cc: linux-sh@vger.kernel.org Subject: [PATCH 1/3] sh_eth: remove mask fields from 'struct bb_info' Date: Tue, 08 Dec 2015 00:40:19 +0300 Message-ID: <8193175.UjRYeBy7vc@wasted.cogentembedded.com> Organization: Cogent Embedded Inc. User-Agent: KMail/4.14.10 (Linux/4.2.6-201.fc22.x86_64; KDE/4.14.14; x86_64; ; ) In-Reply-To: <1582774.FcjyuztLtc@wasted.cogentembedded.com> References: <1582774.FcjyuztLtc@wasted.cogentembedded.com> MIME-Version: 1.0 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The MDIO control bits are always mapped to the same bits of the same register (PIR), so there's no need to store their masks in the 'struct bb_info'... Signed-off-by: Sergei Shtylyov Acked-by: Simon Horman --- drivers/net/ethernet/renesas/sh_eth.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: net-next/drivers/net/ethernet/renesas/sh_eth.c =================================================================== --- net-next.orig/drivers/net/ethernet/renesas/sh_eth.c +++ net-next/drivers/net/ethernet/renesas/sh_eth.c @@ -1013,10 +1013,6 @@ struct bb_info { void (*set_gate)(void *addr); struct mdiobb_ctrl ctrl; void *addr; - u32 mmd_msk;/* MMD */ - u32 mdo_msk; - u32 mdi_msk; - u32 mdc_msk; }; /* PHY bit set */ @@ -1046,9 +1042,9 @@ static void sh_mmd_ctrl(struct mdiobb_ct bitbang->set_gate(bitbang->addr); if (bit) - bb_set(bitbang->addr, bitbang->mmd_msk); + bb_set(bitbang->addr, PIR_MMD); else - bb_clr(bitbang->addr, bitbang->mmd_msk); + bb_clr(bitbang->addr, PIR_MMD); } /* Set bit data*/ @@ -1060,9 +1056,9 @@ static void sh_set_mdio(struct mdiobb_ct bitbang->set_gate(bitbang->addr); if (bit) - bb_set(bitbang->addr, bitbang->mdo_msk); + bb_set(bitbang->addr, PIR_MDO); else - bb_clr(bitbang->addr, bitbang->mdo_msk); + bb_clr(bitbang->addr, PIR_MDO); } /* Get bit data*/ @@ -1073,7 +1069,7 @@ static int sh_get_mdio(struct mdiobb_ctr if (bitbang->set_gate) bitbang->set_gate(bitbang->addr); - return bb_read(bitbang->addr, bitbang->mdi_msk); + return bb_read(bitbang->addr, PIR_MDI); } /* MDC pin control */ @@ -1085,9 +1081,9 @@ static void sh_mdc_ctrl(struct mdiobb_ct bitbang->set_gate(bitbang->addr); if (bit) - bb_set(bitbang->addr, bitbang->mdc_msk); + bb_set(bitbang->addr, PIR_MDC); else - bb_clr(bitbang->addr, bitbang->mdc_msk); + bb_clr(bitbang->addr, PIR_MDC); } /* mdio bus control struct */ @@ -2899,10 +2895,6 @@ static int sh_mdio_init(struct sh_eth_pr /* bitbang init */ bitbang->addr = mdp->addr + mdp->reg_offset[PIR]; bitbang->set_gate = pd->set_mdio_gate; - bitbang->mdi_msk = PIR_MDI; - bitbang->mdo_msk = PIR_MDO; - bitbang->mmd_msk = PIR_MMD; - bitbang->mdc_msk = PIR_MDC; bitbang->ctrl.ops = &bb_ops; /* MII controller setting */