From: Wolfram Sang <w.sang@pengutronix.de>
To: netdev@vger.kernel.org
Cc: socketcan-core@lists.berlios.de, linuxppc-dev@ozlabs.org,
David Miller <davem@davemloft.net>
Subject: [PATCH 04/11] net/can/mscan: use {clr|set}bits8 macros
Date: Mon, 16 Nov 2009 23:57:47 +0100 [thread overview]
Message-ID: <1258412274-14686-5-git-send-email-w.sang@pengutronix.de> (raw)
In-Reply-To: <1258412274-14686-1-git-send-email-w.sang@pengutronix.de>
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
---
drivers/net/can/mscan/mscan.c | 19 +++++++------------
1 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/net/can/mscan/mscan.c b/drivers/net/can/mscan/mscan.c
index 839b471..ca8b556 100644
--- a/drivers/net/can/mscan/mscan.c
+++ b/drivers/net/can/mscan/mscan.c
@@ -78,8 +78,7 @@ static int mscan_set_mode(struct net_device *dev, u8 mode)
canctl1 = in_8(®s->canctl1);
if ((mode & MSCAN_SLPRQ) && !(canctl1 & MSCAN_SLPAK)) {
- out_8(®s->canctl0,
- in_8(®s->canctl0) | MSCAN_SLPRQ);
+ setbits8(®s->canctl0, MSCAN_SLPRQ);
for (i = 0; i < MSCAN_SET_MODE_RETRIES; i++) {
if (in_8(®s->canctl1) & MSCAN_SLPAK)
break;
@@ -105,8 +104,7 @@ static int mscan_set_mode(struct net_device *dev, u8 mode)
}
if ((mode & MSCAN_INITRQ) && !(canctl1 & MSCAN_INITAK)) {
- out_8(®s->canctl0,
- in_8(®s->canctl0) | MSCAN_INITRQ);
+ setbits8(®s->canctl0, MSCAN_INITRQ);
for (i = 0; i < MSCAN_SET_MODE_RETRIES; i++) {
if (in_8(®s->canctl1) & MSCAN_INITAK)
break;
@@ -118,14 +116,12 @@ static int mscan_set_mode(struct net_device *dev, u8 mode)
priv->can.state = CAN_STATE_STOPPED;
if (mode & MSCAN_CSWAI)
- out_8(®s->canctl0,
- in_8(®s->canctl0) | MSCAN_CSWAI);
+ setbits8(®s->canctl0, MSCAN_CSWAI);
} else {
canctl1 = in_8(®s->canctl1);
if (canctl1 & (MSCAN_SLPAK | MSCAN_INITAK)) {
- out_8(®s->canctl0, in_8(®s->canctl0) &
- ~(MSCAN_SLPRQ | MSCAN_INITRQ));
+ clrbits8(®s->canctl0, MSCAN_SLPRQ | MSCAN_INITRQ);
for (i = 0; i < MSCAN_SET_MODE_RETRIES; i++) {
canctl1 = in_8(®s->canctl1);
if (!(canctl1 & (MSCAN_INITAK | MSCAN_SLPAK)))
@@ -359,8 +355,7 @@ static void mscan_get_err_frame(struct net_device *dev, struct can_frame *frame,
*/
out_8(®s->cantier, 0);
out_8(®s->canrier, 0);
- out_8(®s->canctl0, in_8(®s->canctl0) |
- MSCAN_SLPRQ | MSCAN_INITRQ);
+ setbits8(®s->canctl0, MSCAN_SLPRQ | MSCAN_INITRQ);
can_bus_off(dev);
break;
default:
@@ -548,7 +543,7 @@ static int mscan_open(struct net_device *dev)
priv->open_time = jiffies;
- out_8(®s->canctl1, in_8(®s->canctl1) & ~MSCAN_LISTEN);
+ clrbits8(®s->canctl1, MSCAN_LISTEN);
ret = mscan_start(dev);
if (ret)
@@ -623,7 +618,7 @@ void unregister_mscandev(struct net_device *dev)
struct mscan_priv *priv = netdev_priv(dev);
struct mscan_regs *regs = (struct mscan_regs *)priv->reg_base;
mscan_set_mode(dev, MSCAN_INIT_MODE);
- out_8(®s->canctl1, in_8(®s->canctl1) & ~MSCAN_CANE);
+ clrbits8(®s->canctl1, MSCAN_CANE);
unregister_candev(dev);
}
EXPORT_SYMBOL_GPL(unregister_mscandev);
--
1.6.3.3
next prev parent reply other threads:[~2009-11-16 22:58 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-16 22:57 updates to the mscan-driver in net-next Wolfram Sang
2009-11-16 22:57 ` [PATCH 01/11] net/can/mscan: move defines into .h file Wolfram Sang
2009-11-16 22:57 ` [PATCH 02/11] net/can/mscan: trivial fixes Wolfram Sang
2009-11-16 22:57 ` [PATCH 03/11] net/can/mscan: drop support for CAN_MODE_{SLEEP|STOP} Wolfram Sang
2009-11-16 22:57 ` Wolfram Sang [this message]
2009-11-16 22:57 ` [PATCH 05/11] net/can/mscan: fix function annotations Wolfram Sang
2009-11-16 22:57 ` [PATCH 06/11] net/can/mscan: drop assignment in while-construct Wolfram Sang
2009-11-16 22:57 ` [PATCH 07/11] net/can/mpc52xx_can: refactor clock-get routine Wolfram Sang
2009-11-16 22:57 ` [PATCH 08/11] net/can/mpc52xx_can: improve properties and their description Wolfram Sang
2009-11-16 22:57 ` [PATCH 09/11] net/can/mscan: replace hardcoded values with defines Wolfram Sang
2009-11-16 22:57 ` [PATCH 10/11] net/can/mscan: add error path to mscan_open() Wolfram Sang
2009-11-16 22:57 ` [PATCH 11/11] net/can/mscan: improve build Wolfram Sang
2009-11-17 11:54 ` updates to the mscan-driver in net-next David Miller
2009-11-17 15:53 ` Wolfgang Grandegger
2009-11-17 13:07 ` Wolfram Sang
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=1258412274-14686-5-git-send-email-w.sang@pengutronix.de \
--to=w.sang@pengutronix.de \
--cc=davem@davemloft.net \
--cc=linuxppc-dev@ozlabs.org \
--cc=netdev@vger.kernel.org \
--cc=socketcan-core@lists.berlios.de \
/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).