Skip to site navigation (Press enter)

[Linux-kernel-commits] [7974] trunk/drivers/net/can/bfin_can.c: bfin-can: use bfin_read/ write instead of common io APIs

bhsong Fri, 11 Dec 2009 01:31:37 -0800

Title: [7974] trunk/drivers/net/can/bfin_can.c: bfin-can: use bfin_read/write instead of common io APIs

Revision: 7974
Author: bhsong
Date: 2009-12-11 04:31:21 -0500 (Fri, 11 Dec 2009)

Log Message

bfin-can: use bfin_read/write instead of common io APIs

Modified Paths

trunk/drivers/net/can/bfin_can.c

Diff

Modified: trunk/drivers/net/can/bfin_can.c (7973 => 7974)


--- trunk/drivers/net/can/bfin_can.c	2009-12-11 06:28:24 UTC (rev 7973)
+++ trunk/drivers/net/can/bfin_can.c	2009-12-11 09:31:21 UTC (rev 7974)
@@ -162,8 +162,8 @@
 	if (priv->can.ctrlmode & CAN_CTRLMODE_3_SAMPLES)
 		timing |= SAM;
 
-	writew(clk, &reg->clk);
-	writew(timing, &reg->timing);
+	bfin_write16(&reg->clk, clk);
+	bfin_write16(&reg->timing, timing);
 
 	dev_info(dev->dev.parent, "setting CLOCK=0x%04x TIMING=0x%04x\n",
 			clk, timing);
@@ -179,16 +179,16 @@
 	int i;
 
 	/* disable interrupts */
-	writew(0, &reg->mbim1);
-	writew(0, &reg->mbim2);
-	writew(0, &reg->gim);
+	bfin_write16(&reg->mbim1, 0);
+	bfin_write16(&reg->mbim2, 0);
+	bfin_write16(&reg->gim, 0);
 
 	/* reset can and enter configuration mode */
-	writew(SRS | CCR, &reg->ctrl);
+	bfin_write16(&reg->ctrl, SRS | CCR);
 	SSYNC();
-	writew(CCR, &reg->ctrl);
+	bfin_write16(&reg->ctrl, CCR);
 	SSYNC();
-	while (!(readw(&reg->ctrl) & CCA)) {
+	while (!(bfin_read16(&reg->ctrl) & CCA)) {
 		udelay(10);
 		if (--timeout == 0) {
 			dev_err(dev->dev.parent,
@@ -202,33 +202,33 @@
 	 * by writing to CAN Mailbox Configuration Registers 1 and 2
 	 * For all bits: 0 - Mailbox disabled, 1 - Mailbox enabled
 	 */
-	writew(0, &reg->mc1);
-	writew(0, &reg->mc2);
+	bfin_write16(&reg->mc1, 0);
+	bfin_write16(&reg->mc2, 0);
 
 	/* Set Mailbox Direction */
-	writew(0xFFFF, &reg->md1);   /* mailbox 1-16 are RX */
-	writew(0, &reg->md2);   /* mailbox 17-32 are TX */
+	bfin_write16(&reg->md1, 0xFFFF);   /* mailbox 1-16 are RX */
+	bfin_write16(&reg->md2, 0);   /* mailbox 17-32 are TX */
 
 	/* RECEIVE_STD_CHL */
 	for (i = 0; i < 2; i++) {
-		writew(0, &reg->chl[RECEIVE_STD_CHL + i].id0);
-		writew(AME, &reg->chl[RECEIVE_STD_CHL + i].id1);
-		writew(0, &reg->chl[RECEIVE_STD_CHL + i].dlc);
-		writew(0x1FFF, &reg->msk[RECEIVE_STD_CHL + i].amh);
-		writew(0xFFFF, &reg->msk[RECEIVE_STD_CHL + i].aml);
+		bfin_write16(&reg->chl[RECEIVE_STD_CHL + i].id0, 0);
+		bfin_write16(&reg->chl[RECEIVE_STD_CHL + i].id1, AME);
+		bfin_write16(&reg->chl[RECEIVE_STD_CHL + i].dlc, 0);
+		bfin_write16(&reg->msk[RECEIVE_STD_CHL + i].amh, 0x1FFF);
+		bfin_write16(&reg->msk[RECEIVE_STD_CHL + i].aml, 0xFFFF);
 	}
 
 	/* RECEIVE_EXT_CHL */
 	for (i = 0; i < 2; i++) {
-		writew(0, &reg->chl[RECEIVE_EXT_CHL + i].id0);
-		writew(AME | IDE, &reg->chl[RECEIVE_EXT_CHL + i].id1);
-		writew(0, &reg->chl[RECEIVE_EXT_CHL + i].dlc);
-		writew(0x1FFF, &reg->msk[RECEIVE_EXT_CHL + i].amh);
-		writew(0xFFFF, &reg->msk[RECEIVE_EXT_CHL + i].aml);
+		bfin_write16(&reg->chl[RECEIVE_EXT_CHL + i].id0, 0);
+		bfin_write16(&reg->chl[RECEIVE_EXT_CHL + i].id1, AME | IDE);
+		bfin_write16(&reg->chl[RECEIVE_EXT_CHL + i].dlc, 0);
+		bfin_write16(&reg->msk[RECEIVE_EXT_CHL + i].amh, 0x1FFF);
+		bfin_write16(&reg->msk[RECEIVE_EXT_CHL + i].aml, 0xFFFF);
 	}
 
-	writew(BIT(TRANSMIT_CHL - 16), &reg->mc2);
-	writew(BIT(RECEIVE_STD_CHL) + BIT(RECEIVE_EXT_CHL), &reg->mc1);
+	bfin_write16(&reg->mc2, BIT(TRANSMIT_CHL - 16));
+	bfin_write16(&reg->mc1, BIT(RECEIVE_STD_CHL) + BIT(RECEIVE_EXT_CHL));
 	SSYNC();
 
 	priv->can.state = CAN_STATE_STOPPED;
@@ -243,9 +243,9 @@
 	/*
 	 * leave configuration mode
 	 */
-	writew(readw(&reg->ctrl) & ~CCR, &reg->ctrl);
+	bfin_write16(&reg->ctrl, bfin_read16(&reg->ctrl) & ~CCR);
 
-	while (readw(&reg->status) & CCA) {
+	while (bfin_read16(&reg->status) & CCA) {
 		udelay(10);
 		if (--timeout == 0) {
 			dev_err(dev->dev.parent,
@@ -257,25 +257,25 @@
 	/*
 	 * clear _All_  tx and rx interrupts
 	 */
-	writew(0xFFFF, &reg->mbtif1);
-	writew(0xFFFF, &reg->mbtif2);
-	writew(0xFFFF, &reg->mbrif1);
-	writew(0xFFFF, &reg->mbrif2);
+	bfin_write16(&reg->mbtif1, 0xFFFF);
+	bfin_write16(&reg->mbtif2, 0xFFFF);
+	bfin_write16(&reg->mbrif1, 0xFFFF);
+	bfin_write16(&reg->mbrif2, 0xFFFF);
 
 	/*
 	 * clear global interrupt status register
 	 */
-	writew(0x7FF, &reg->gis); /* overwrites with '1' */
+	bfin_write16(&reg->gis, 0x7FF); /* overwrites with '1' */
 
 	/*
 	 * Initialize Interrupts
 	 * - set bits in the mailbox interrupt mask register
 	 * - global interrupt mask
 	 */
-	writew(BIT(RECEIVE_STD_CHL) + BIT(RECEIVE_EXT_CHL), &reg->mbim1);
-	writew(BIT(TRANSMIT_CHL - 16), &reg->mbim2);
+	bfin_write16(&reg->mbim1, BIT(RECEIVE_STD_CHL) + BIT(RECEIVE_EXT_CHL));
+	bfin_write16(&reg->mbim2, BIT(TRANSMIT_CHL - 16));
 
-	writew(EPIM | BOIM | RMLIM, &reg->gim);
+	bfin_write16(&reg->gim, EPIM | BOIM | RMLIM);
 	SSYNC();
 }
 
@@ -322,7 +322,7 @@
 
 	/* fill id */
 	if (id & CAN_EFF_FLAG) {
-		writew(id, &reg->chl[TRANSMIT_CHL].id0);
+		bfin_write16(&reg->chl[TRANSMIT_CHL].id0, id);
 		if (id & CAN_RTR_FLAG)
 			writew(((id & 0x1FFF0000) >> 16) | IDE | AME | RTR,
 					&reg->chl[TRANSMIT_CHL].id1);
@@ -335,25 +335,26 @@
 			writew((id << 2) | AME | RTR,
 				&reg->chl[TRANSMIT_CHL].id1);
 		else
-			writew((id << 2) | AME, &reg->chl[TRANSMIT_CHL].id1);
+			bfin_write16(&reg->chl[TRANSMIT_CHL].id1,
+					(id << 2) | AME);
 	}
 
 	/* fill payload */
 	for (i = 0; i < 8; i += 2) {
 		val = ((7 - i) < dlc ? (data[7 - i]) : 0) +
 			((6 - i) < dlc ? (data[6 - i] << 8) : 0);
-		writew(val, &reg->chl[TRANSMIT_CHL].data[i]);
+		bfin_write16(&reg->chl[TRANSMIT_CHL].data[i], val);
 	}
 
 	/* fill data length code */
-	writew(dlc, &reg->chl[TRANSMIT_CHL].dlc);
+	bfin_write16(&reg->chl[TRANSMIT_CHL].dlc, dlc);
 
 	dev->trans_start = jiffies;
 
 	can_put_echo_skb(skb, dev, 0);
 
 	/* set transmit request */
-	writew(BIT(TRANSMIT_CHL - 16), &reg->trs2);
+	bfin_write16(&reg->trs2, BIT(TRANSMIT_CHL - 16));
 
 	return 0;
 }
@@ -376,25 +377,26 @@
 	/* get id */
 	if (isrc & BIT(RECEIVE_EXT_CHL)) {
 		/* extended frame format (EFF) */
-		cf->can_id = ((readw(&reg->chl[RECEIVE_EXT_CHL].id1) & 0x1FFF)
-				<< 16) + readw(&reg->chl[RECEIVE_EXT_CHL].id0);
+		cf->can_id = ((bfin_read16(&reg->chl[RECEIVE_EXT_CHL].id1)
+			     & 0x1FFF) << 16)
+			     + bfin_read16(&reg->chl[RECEIVE_EXT_CHL].id0);
 		cf->can_id |= CAN_EFF_FLAG;
 		obj = RECEIVE_EXT_CHL;
 	} else {
 		/* standard frame format (SFF) */
-		cf->can_id = (readw(&reg->chl[RECEIVE_STD_CHL].id1) & 0x1ffc)
-				>> 2;
+		cf->can_id = (bfin_read16(&reg->chl[RECEIVE_STD_CHL].id1)
+			     & 0x1ffc) >> 2;
 		obj = RECEIVE_STD_CHL;
 	}
-	if (readw(&reg->chl[obj].id1) & RTR)
+	if (bfin_read16(&reg->chl[obj].id1) & RTR)
 		cf->can_id |= CAN_RTR_FLAG;
 
 	/* get data length code */
-	cf->can_dlc = readw(&reg->chl[obj].dlc);
+	cf->can_dlc = bfin_read16(&reg->chl[obj].dlc);
 
 	/* get payload */
 	for (i = 0; i < 8; i += 2) {
-		val = readw(&reg->chl[obj].data[i]);
+		val = bfin_read16(&reg->chl[obj].data[i]);
 		cf->data[7 - i] = (7 - i) < cf->can_dlc ? val : 0;
 		cf->data[6 - i] = (6 - i) < cf->can_dlc ? (val >> 8) : 0;
 	}
@@ -448,7 +450,7 @@
 
 	if (state != priv->can.state && (state == CAN_STATE_ERROR_WARNING ||
 				state == CAN_STATE_ERROR_PASSIVE)) {
-		u16 cec = readw(&reg->cec);
+		u16 cec = bfin_read16(&reg->cec);
 		u8 rxerr = cec;
 		u8 txerr = cec >> 8;
 
@@ -499,23 +501,23 @@
 	struct net_device_stats *stats = &dev->stats;
 	u16 status, isrc;
 
-	if ((irq == priv->tx_irq) && readw(&reg->mbtif2)) {
+	if ((irq == priv->tx_irq) && bfin_read16(&reg->mbtif2)) {
 		/* transmission complete interrupt */
-		writew(0xFFFF, &reg->mbtif2);
+		bfin_write16(&reg->mbtif2, 0xFFFF);
 		stats->tx_packets++;
-		stats->tx_bytes += readw(&reg->chl[TRANSMIT_CHL].dlc);
+		stats->tx_bytes += bfin_read16(&reg->chl[TRANSMIT_CHL].dlc);
 		can_get_echo_skb(dev, 0);
 		netif_wake_queue(dev);
-	} else if ((irq == priv->rx_irq) && readw(&reg->mbrif1)) {
+	} else if ((irq == priv->rx_irq) && bfin_read16(&reg->mbrif1)) {
 		/* receive interrupt */
-		isrc = readw(&reg->mbrif1);
-		writew(0xFFFF, &reg->mbrif1);
+		isrc = bfin_read16(&reg->mbrif1);
+		bfin_write16(&reg->mbrif1, 0xFFFF);
 		bfin_can_rx(dev, isrc);
-	} else if ((irq == priv->err_irq) && readw(&reg->gis)) {
+	} else if ((irq == priv->err_irq) && bfin_read16(&reg->gis)) {
 		/* error interrupt */
-		isrc = readw(&reg->gis);
-		status = readw(&reg->esr);
-		writew(0x7FF, &reg->gis);
+		isrc = bfin_read16(&reg->gis);
+		status = bfin_read16(&reg->esr);
+		bfin_write16(&reg->gis, 0x7FF);
 		bfin_can_err(dev, isrc, status);
 	} else {
 		return IRQ_NONE;
@@ -719,9 +721,9 @@
 
 	if (netif_running(dev)) {
 		/* enter sleep mode */
-		writew(readw(&reg->ctrl) | SMR, &reg->ctrl);
+		bfin_write16(&reg->ctrl, bfin_read16(&reg->ctrl) | SMR);
 		SSYNC();
-		while (!(readw(&reg->intr) & SMACK)) {
+		while (!(bfin_read16(&reg->intr) & SMACK)) {
 			udelay(10);
 			if (--timeout == 0) {
 				dev_err(dev->dev.parent,
@@ -742,7 +744,7 @@
 
 	if (netif_running(dev)) {
 		/* leave sleep mode */
-		writew(0, &reg->intr);
+		bfin_write16(&reg->intr, 0);
 		SSYNC();
 	}

_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits