diff options
| author | Al Viro <viro@www.linux.org.uk> | 2005-04-25 21:32:12 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-25 21:32:12 -0400 |
| commit | 7366d36cb967d7a3ac324c789a8b718e61d01b31 (patch) | |
| tree | 131671cdfb498727ed64bf49d52c846743e31a6d /drivers/i2c | |
| parent | 2c6e75999000ebc942526466dbd0de37bfac73a4 (diff) | |
[PATCH] ppc annotations: i2c-mpc
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>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-mpc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c index 75b8d867dae..6f33496d31c 100644 --- a/drivers/i2c/busses/i2c-mpc.c +++ b/drivers/i2c/busses/i2c-mpc.c | |||
| @@ -55,7 +55,7 @@ | |||
| 55 | #define CSR_RXAK 0x01 | 55 | #define CSR_RXAK 0x01 |
| 56 | 56 | ||
| 57 | struct mpc_i2c { | 57 | struct mpc_i2c { |
| 58 | char *base; | 58 | void __iomem *base; |
| 59 | u32 interrupt; | 59 | u32 interrupt; |
| 60 | wait_queue_head_t queue; | 60 | wait_queue_head_t queue; |
| 61 | struct i2c_adapter adap; | 61 | struct i2c_adapter adap; |
| @@ -444,7 +444,7 @@ static int fsl_i2c_probe(struct device *device) | |||
| 444 | 444 | ||
| 445 | fail_add: | 445 | fail_add: |
| 446 | if (i2c->irq != 0) | 446 | if (i2c->irq != 0) |
| 447 | free_irq(i2c->irq, 0); | 447 | free_irq(i2c->irq, NULL); |
| 448 | fail_irq: | 448 | fail_irq: |
| 449 | iounmap(i2c->base); | 449 | iounmap(i2c->base); |
| 450 | fail_map: | 450 | fail_map: |