X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fmacintosh%2Fmacio-adb.c;h=cf6a6f2248ac421aee3fc1bb2629710c280ef33c;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=5283a6d11b45115b5d9907e45eeea2bc50ead36f;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;p=linux-2.6.git

diff --git a/drivers/macintosh/macio-adb.c b/drivers/macintosh/macio-adb.c
index 5283a6d11..cf6a6f224 100644
--- a/drivers/macintosh/macio-adb.c
+++ b/drivers/macintosh/macio-adb.c
@@ -57,9 +57,9 @@ struct adb_regs {
 /* Bits in autopoll register */
 #define APE	1		/* autopoll enable */
 
-static volatile struct adb_regs *adb;
+static volatile struct adb_regs __iomem *adb;
 static struct adb_request *current_req, *last_req;
-static spinlock_t macio_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(macio_lock);
 
 static int macio_probe(void);
 static int macio_init(void);
@@ -105,8 +105,7 @@ int macio_init(void)
 	printk("\n"); }
 #endif
 	
-	adb = (volatile struct adb_regs *)
-		ioremap(adbs->addrs->address, sizeof(struct adb_regs));
+	adb = ioremap(adbs->addrs->address, sizeof(struct adb_regs));
 
 	out_8(&adb->ctrl.r, 0);
 	out_8(&adb->intr.r, 0);
@@ -202,7 +201,7 @@ static irqreturn_t macio_adb_interrupt(int irq, void *arg,
 				       struct pt_regs *regs)
 {
 	int i, n, err;
-	struct adb_request *req;
+	struct adb_request *req = NULL;
 	unsigned char ibuf[16];
 	int ibuf_len = 0;
 	int complete = 0;