diff options
Diffstat (limited to 'drivers/i2c/busses/i2c-pnx.c')
-rw-r--r-- | drivers/i2c/busses/i2c-pnx.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/i2c/busses/i2c-pnx.c b/drivers/i2c/busses/i2c-pnx.c index ec15cff556b9..6ff6c20f1e78 100644 --- a/drivers/i2c/busses/i2c-pnx.c +++ b/drivers/i2c/busses/i2c-pnx.c | |||
@@ -586,7 +586,8 @@ static int __devinit i2c_pnx_probe(struct platform_device *pdev) | |||
586 | alg_data->mif.timer.data = (unsigned long)i2c_pnx->adapter; | 586 | alg_data->mif.timer.data = (unsigned long)i2c_pnx->adapter; |
587 | 587 | ||
588 | /* Register I/O resource */ | 588 | /* Register I/O resource */ |
589 | if (!request_region(alg_data->base, I2C_PNX_REGION_SIZE, pdev->name)) { | 589 | if (!request_mem_region(alg_data->base, I2C_PNX_REGION_SIZE, |
590 | pdev->name)) { | ||
590 | dev_err(&pdev->dev, | 591 | dev_err(&pdev->dev, |
591 | "I/O region 0x%08x for I2C already in use.\n", | 592 | "I/O region 0x%08x for I2C already in use.\n", |
592 | alg_data->base); | 593 | alg_data->base); |
@@ -650,7 +651,7 @@ out_clock: | |||
650 | out_unmap: | 651 | out_unmap: |
651 | iounmap((void *)alg_data->ioaddr); | 652 | iounmap((void *)alg_data->ioaddr); |
652 | out_release: | 653 | out_release: |
653 | release_region(alg_data->base, I2C_PNX_REGION_SIZE); | 654 | release_mem_region(alg_data->base, I2C_PNX_REGION_SIZE); |
654 | out_drvdata: | 655 | out_drvdata: |
655 | platform_set_drvdata(pdev, NULL); | 656 | platform_set_drvdata(pdev, NULL); |
656 | out: | 657 | out: |
@@ -667,7 +668,7 @@ static int __devexit i2c_pnx_remove(struct platform_device *pdev) | |||
667 | i2c_del_adapter(adap); | 668 | i2c_del_adapter(adap); |
668 | i2c_pnx->set_clock_stop(pdev); | 669 | i2c_pnx->set_clock_stop(pdev); |
669 | iounmap((void *)alg_data->ioaddr); | 670 | iounmap((void *)alg_data->ioaddr); |
670 | release_region(alg_data->base, I2C_PNX_REGION_SIZE); | 671 | release_mem_region(alg_data->base, I2C_PNX_REGION_SIZE); |
671 | platform_set_drvdata(pdev, NULL); | 672 | platform_set_drvdata(pdev, NULL); |
672 | 673 | ||
673 | return 0; | 674 | return 0; |