From: Jesse Huang <jesse@icplus.com.tw>
To: romieu@fr.zoreil.com, penberg@cs.Helsinki.FI, akpm@osdl.org,
dvrabel@cantab.net, linux-kernel@vger.kernel.org,
netdev@vger.kernel.org, david@pleyades.net, jesse@icplus.com.tw
Subject: [PATCH 5/7] ip1000: Modify coding style of ipg_config_autoneg()
Date: Thu, 17 Aug 2006 15:47:41 -0400 [thread overview]
Message-ID: <1155844061.5006.13.camel@localhost.localdomain> (raw)
From: Jesse Huang <jesse@icplus.com.tw>
This is only coding style modify for ipg_config_autoneg(). Thanks for the
suggestion form Francois.
Change Logs:
Modify coding style of ipg_config_autoneg()
---
drivers/net/ipg.c | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
737498ca620437d8179e21be4d5220333066cbbd
diff --git a/drivers/net/ipg.c b/drivers/net/ipg.c
index f859107..be96f93 100644
--- a/drivers/net/ipg.c
+++ b/drivers/net/ipg.c
@@ -491,11 +491,13 @@ static int ipg_config_autoneg(struct net
int fullduplex;
int txflowcontrol;
int rxflowcontrol;
+ long MacCtrlValue;
IPG_DEBUG_MSG("_config_autoneg\n");
asicctrl = ioread32(ioaddr + ASIC_CTRL);
- phyctrl = ioread32(ioaddr + PHY_CTRL);
+ phyctrl = ioread8(ioaddr + PHY_CTRL);
+ MacCtrlValue = ioread32(ioaddr + MAC_CTRL);
/* Set flags for use in resolving auto-negotation, assuming
* non-1000Mbps, half duplex, no flow control.
@@ -547,22 +549,22 @@ static int ipg_config_autoneg(struct net
/* Configure IPG for full duplex operation. */
printk(KERN_INFO "setting full duplex, ");
- iowrite32(ioread32(ioaddr + MAC_CTRL) | IPG_MC_DUPLEX_SELECT_FD, ioaddr + MAC_CTRL);
+ MacCtrlValue |= IPG_MC_DUPLEX_SELECT_FD;
if (txflowcontrol == 1) {
printk("TX flow control");
- iowrite32(ioread32(ioaddr + MAC_CTRL) | IPG_MC_TX_FLOW_CONTROL_ENABLE, ioaddr + MAC_CTRL);
+ MacCtrlValue |= IPG_MC_TX_FLOW_CONTROL_ENABLE;
} else {
printk("no TX flow control");
- iowrite32(ioread32(ioaddr + MAC_CTRL) & ~IPG_MC_TX_FLOW_CONTROL_ENABLE, ioaddr + MAC_CTRL);
+ MacCtrlValue &= ~IPG_MC_TX_FLOW_CONTROL_ENABLE;
}
if (rxflowcontrol == 1) {
printk(", RX flow control.");
- iowrite32(ioread32(ioaddr+MAC_CTRL) | IPG_MC_RX_FLOW_CONTROL_ENABLE, ioaddr + MAC_CTRL);
+ MacCtrlValue |= IPG_MC_RX_FLOW_CONTROL_ENABLE;
} else {
printk(", no RX flow control.");
- iowrite32(ioread32(ioaddr+MAC_CTRL) & ~IPG_MC_RX_FLOW_CONTROL_ENABLE, ioaddr + MAC_CTRL);
+ MacCtrlValue = MacCtrlValue & ~IPG_MC_RX_FLOW_CONTROL_ENABLE;
}
printk("\n");
@@ -570,8 +572,9 @@ static int ipg_config_autoneg(struct net
/* Configure IPG for half duplex operation. */
printk(KERN_INFO "setting half duplex, no TX flow control, no RX flow control.\n");
- iowrite32(ioread32(ioaddr+MAC_CTRL) & ~IPG_MC_DUPLEX_SELECT_FD & ~IPG_MC_TX_FLOW_CONTROL_ENABLE & ~IPG_MC_RX_FLOW_CONTROL_ENABLE, ioaddr + MAC_CTRL);
+ MacCtrlValue &= ~IPG_MC_DUPLEX_SELECT_FD & ~IPG_MC_TX_FLOW_CONTROL_ENABLE & ~IPG_MC_RX_FLOW_CONTROL_ENABLE;
}
+ iowrite32(MacCtrlValue , ioaddr+MAC_CTRL);
return 0;
}
--
1.3.GIT
next reply other threads:[~2006-08-17 8:00 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-08-17 19:47 Jesse Huang [this message]
2006-08-19 10:17 ` [PATCH 5/7] ip1000: Modify coding style of ipg_config_autoneg() Francois Romieu
2006-08-21 3:27 ` Jesse Huang
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=1155844061.5006.13.camel@localhost.localdomain \
--to=jesse@icplus.com.tw \
--cc=akpm@osdl.org \
--cc=david@pleyades.net \
--cc=dvrabel@cantab.net \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=penberg@cs.Helsinki.FI \
--cc=romieu@fr.zoreil.com \
/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).