From 428e0621fa313a303fbd5a0cde7c74cd052c4565 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Tue, 9 Sep 2008 19:50:04 -0700
Subject: [PATCH] --- yaml --- r: 113114 b: refs/heads/master c:
 503acc8a33b1f41a547517c9a592af5e5968f85c h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/rtc/rtc-bq4802.c | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 0c9456a29a22..cbd64261e426 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4944f7e5c917949451ba7f32aab5d297d8b03c7f
+refs/heads/master: 503acc8a33b1f41a547517c9a592af5e5968f85c
diff --git a/trunk/drivers/rtc/rtc-bq4802.c b/trunk/drivers/rtc/rtc-bq4802.c
index 541580cb6df4..189a018bdf34 100644
--- a/trunk/drivers/rtc/rtc-bq4802.c
+++ b/trunk/drivers/rtc/rtc-bq4802.c
@@ -17,6 +17,7 @@ MODULE_LICENSE("GPL");
 
 struct bq4802 {
 	void __iomem		*regs;
+	unsigned long		ioport;
 	struct rtc_device	*rtc;
 	spinlock_t		lock;
 	struct resource		*r;
@@ -26,12 +27,12 @@ struct bq4802 {
 
 static u8 bq4802_read_io(struct bq4802 *p, int off)
 {
-	return inb(p->regs + off);
+	return inb(p->ioport + off);
 }
 
 static void bq4802_write_io(struct bq4802 *p, int off, u8 val)
 {
-	return outb(val, p->regs + off);
+	outb(val, p->ioport + off);
 }
 
 static u8 bq4802_read_mem(struct bq4802 *p, int off)
@@ -41,7 +42,7 @@ static u8 bq4802_read_mem(struct bq4802 *p, int off)
 
 static void bq4802_write_mem(struct bq4802 *p, int off, u8 val)
 {
-	return writeb(val, p->regs + off);
+	writeb(val, p->regs + off);
 }
 
 static int bq4802_read_time(struct device *dev, struct rtc_time *tm)
@@ -156,7 +157,7 @@ static int __devinit bq4802_probe(struct platform_device *pdev)
 			goto out_free;
 	}
 	if (p->r->flags & IORESOURCE_IO) {
-		p->regs = (void __iomem *) p->r->start;
+		p->ioport = p->r->start;
 		p->read = bq4802_read_io;
 		p->write = bq4802_write_io;
 	} else if (p->r->flags & IORESOURCE_MEM) {