From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
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 [thread overview]
Message-ID: <8193175.UjRYeBy7vc@wasted.cogentembedded.com> (raw)
In-Reply-To: <1582774.FcjyuztLtc@wasted.cogentembedded.com>
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 <sergei.shtylyov@cogentembedded.com>
---
drivers/net/ethernet/renesas/sh_eth.c | 22 +++++++---------------
1 file changed, 7 insertions(+), 15 deletions(-)
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 */
next prev parent reply other threads:[~2015-12-07 21:40 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-07 21:39 [PATCH 0/3] sh_eth: optimize MDIO code Sergei Shtylyov
2015-12-07 21:40 ` Sergei Shtylyov [this message]
2015-12-08 0:42 ` [PATCH 1/3] sh_eth: remove mask fields from 'struct bb_info' Simon Horman
2015-12-07 21:40 ` [PATCH 2/3] sh_eth: factor out common code from MDIO bitbang methods Sergei Shtylyov
2015-12-08 0:42 ` Simon Horman
2015-12-07 21:41 ` [PATCH 3/3] sh_eth: get rid of bb_{set|clr|read}() Sergei Shtylyov
2015-12-08 0:42 ` Simon Horman
2015-12-09 2:56 ` [PATCH 0/3] sh_eth: optimize MDIO code David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8193175.UjRYeBy7vc@wasted.cogentembedded.com \
--to=sergei.shtylyov@cogentembedded.com \
--cc=linux-sh@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).