diff options
Diffstat (limited to 'drivers/sbus/char/bbc_i2c.c')
-rw-r--r-- | drivers/sbus/char/bbc_i2c.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/sbus/char/bbc_i2c.c b/drivers/sbus/char/bbc_i2c.c index 8bfdd63a1fcb..40d7a1fc69af 100644 --- a/drivers/sbus/char/bbc_i2c.c +++ b/drivers/sbus/char/bbc_i2c.c | |||
@@ -317,7 +317,7 @@ static struct bbc_i2c_bus * __init attach_one_i2c(struct of_device *op, int inde | |||
317 | 317 | ||
318 | bp->waiting = 0; | 318 | bp->waiting = 0; |
319 | init_waitqueue_head(&bp->wq); | 319 | init_waitqueue_head(&bp->wq); |
320 | if (request_irq(op->irqs[0], bbc_i2c_interrupt, | 320 | if (request_irq(op->archdata.irqs[0], bbc_i2c_interrupt, |
321 | IRQF_SHARED, "bbc_i2c", bp)) | 321 | IRQF_SHARED, "bbc_i2c", bp)) |
322 | goto fail; | 322 | goto fail; |
323 | 323 | ||
@@ -373,7 +373,7 @@ static int __devinit bbc_i2c_probe(struct of_device *op, | |||
373 | 373 | ||
374 | err = bbc_envctrl_init(bp); | 374 | err = bbc_envctrl_init(bp); |
375 | if (err) { | 375 | if (err) { |
376 | free_irq(op->irqs[0], bp); | 376 | free_irq(op->archdata.irqs[0], bp); |
377 | if (bp->i2c_bussel_reg) | 377 | if (bp->i2c_bussel_reg) |
378 | of_iounmap(&op->resource[0], bp->i2c_bussel_reg, 1); | 378 | of_iounmap(&op->resource[0], bp->i2c_bussel_reg, 1); |
379 | if (bp->i2c_control_regs) | 379 | if (bp->i2c_control_regs) |
@@ -392,7 +392,7 @@ static int __devexit bbc_i2c_remove(struct of_device *op) | |||
392 | 392 | ||
393 | bbc_envctrl_cleanup(bp); | 393 | bbc_envctrl_cleanup(bp); |
394 | 394 | ||
395 | free_irq(op->irqs[0], bp); | 395 | free_irq(op->archdata.irqs[0], bp); |
396 | 396 | ||
397 | if (bp->i2c_bussel_reg) | 397 | if (bp->i2c_bussel_reg) |
398 | of_iounmap(&op->resource[0], bp->i2c_bussel_reg, 1); | 398 | of_iounmap(&op->resource[0], bp->i2c_bussel_reg, 1); |