]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
[PATCH] ppc annotations: i2c-mpc
authorAl Viro <viro@www.linux.org.uk>
Tue, 26 Apr 2005 01:32:12 +0000 (18:32 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 26 Apr 2005 01:32:12 +0000 (18:32 -0700)
Usual iomem annotations and NULL noise removal.

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
drivers/i2c/busses/i2c-mpc.c

index 75b8d867dae11a5ab0dfb2710479cc1c8928961d..6f33496d31c31e6c57d3d2479db4afb4dad23617 100644 (file)
@@ -55,7 +55,7 @@
 #define CSR_RXAK 0x01
 
 struct mpc_i2c {
-       char *base;
+       void __iomem *base;
        u32 interrupt;
        wait_queue_head_t queue;
        struct i2c_adapter adap;
@@ -444,7 +444,7 @@ static int fsl_i2c_probe(struct device *device)
 
       fail_add:
        if (i2c->irq != 0)
-               free_irq(i2c->irq, 0);
+               free_irq(i2c->irq, NULL);
       fail_irq:
        iounmap(i2c->base);
       fail_map: