[git] batman-adv branch, linux, updated. 31791c214a69092cb9feb5a6198a695a21fa0b24 - commits - lists.open-mesh.org

9 Nov 2009

The following commit has been merged in the linux branch:
commit 16dd18b0837dee46f1a6b0c01830c5f2b7187266
Author: Thomas Chou thomas@wytron.com.tw
Date:   Wed Oct 7 14:16:42 2009 +0000
ethoc: inline regs access
Signed-off-by: Thomas Chou thomas@wytron.com.tw
    Signed-off-by: David S. Miller davem@davemloft.net

diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c
index 1d338c6..88a1c52 100644
--- a/drivers/net/ethoc.c
+++ b/drivers/net/ethoc.c
@@ -222,24 +222,25 @@ struct ethoc_bd {
    u32 addr;
 };
-static u32 ethoc_read(struct ethoc *dev, loff_t offset)
+static inline u32 ethoc_read(struct ethoc *dev, loff_t offset)
 {
    return ioread32(dev->iobase + offset);
 }
-static void ethoc_write(struct ethoc *dev, loff_t offset, u32 data)
+static inline void ethoc_write(struct ethoc *dev, loff_t offset, u32 data)
 {
    iowrite32(data, dev->iobase + offset);
 }
-static void ethoc_read_bd(struct ethoc *dev, int index, struct ethoc_bd *bd)
+static inline void ethoc_read_bd(struct ethoc *dev, int index,
+		struct ethoc_bd *bd)
 {
    loff_t offset = ETHOC_BD_BASE + (index * sizeof(struct ethoc_bd));
    bd->stat = ethoc_read(dev, offset + 0);
    bd->addr = ethoc_read(dev, offset + 4);
 }
-static void ethoc_write_bd(struct ethoc *dev, int index,
+static inline void ethoc_write_bd(struct ethoc *dev, int index,
    	const struct ethoc_bd *bd)
 {
    loff_t offset = ETHOC_BD_BASE + (index * sizeof(struct ethoc_bd));
@@ -247,33 +248,33 @@ static void ethoc_write_bd(struct ethoc *dev, int index,
    ethoc_write(dev, offset + 4, bd->addr);
 }
-static void ethoc_enable_irq(struct ethoc *dev, u32 mask)
+static inline void ethoc_enable_irq(struct ethoc *dev, u32 mask)
 {
    u32 imask = ethoc_read(dev, INT_MASK);
    imask |= mask;
    ethoc_write(dev, INT_MASK, imask);
 }
-static void ethoc_disable_irq(struct ethoc *dev, u32 mask)
+static inline void ethoc_disable_irq(struct ethoc *dev, u32 mask)
 {
    u32 imask = ethoc_read(dev, INT_MASK);
    imask &= ~mask;
    ethoc_write(dev, INT_MASK, imask);
 }
-static void ethoc_ack_irq(struct ethoc *dev, u32 mask)
+static inline void ethoc_ack_irq(struct ethoc *dev, u32 mask)
 {
    ethoc_write(dev, INT_SOURCE, mask);
 }
-static void ethoc_enable_rx_and_tx(struct ethoc *dev)
+static inline void ethoc_enable_rx_and_tx(struct ethoc *dev)
 {
    u32 mode = ethoc_read(dev, MODER);
    mode |= MODER_RXEN | MODER_TXEN;
    ethoc_write(dev, MODER, mode);
 }
-static void ethoc_disable_rx_and_tx(struct ethoc *dev)
+static inline void ethoc_disable_rx_and_tx(struct ethoc *dev)
 {
    u32 mode = ethoc_read(dev, MODER);
    mode &= ~(MODER_RXEN | MODER_TXEN);
-- 
batman-adv

    