Merge tag 'pm+acpi-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[linux-2.6-microblaze.git] / drivers / i2c / busses / i2c-designware-platdrv.c

diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c
index fa4e2b5..0a80e4a 100644 (file)
--- a/drivers/i2c/busses/i2c-designware-platdrv.c
+++ b/drivers/i2c/busses/i2c-designware-platdrv.c
@@ -164,7 +164,7 @@ static int dw_i2c_probe(struct platform_device *pdev)
        /* fast mode by default because of legacy reasons */
        clk_freq = 400000;
 
-       if (ACPI_COMPANION(&pdev->dev)) {
+       if (has_acpi_companion(&pdev->dev)) {
                dw_i2c_acpi_configure(pdev);
        } else if (pdev->dev.of_node) {
                of_property_read_u32(pdev->dev.of_node,
@@ -284,7 +284,7 @@ static int dw_i2c_remove(struct platform_device *pdev)
        pm_runtime_put(&pdev->dev);
        pm_runtime_disable(&pdev->dev);
 
-       if (ACPI_COMPANION(&pdev->dev))
+       if (has_acpi_companion(&pdev->dev))
                dw_i2c_acpi_unconfigure(pdev);
 
        return 0;