From 4e7e64d15276954e6e975d9cfd26f027c3cc6d25 Mon Sep 17 00:00:00 2001 From: Mika Westerberg Date: Wed, 10 Apr 2013 00:36:39 +0000 Subject: [PATCH] --- yaml --- r: 371005 b: refs/heads/master c: efe7d640ef486c4c0c305641dbcacc6918542b76 h: refs/heads/master i: 371003: 591b6f96bb9d05455954de455a6a0f795674d4ce v: v3 --- [refs] | 2 +- trunk/drivers/i2c/busses/i2c-designware-platdrv.c | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 07140aeee7c0..f676e75a1197 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 76cf3fc844a46b5cdb94da98bffcbd45d4c355b8 +refs/heads/master: efe7d640ef486c4c0c305641dbcacc6918542b76 diff --git a/trunk/drivers/i2c/busses/i2c-designware-platdrv.c b/trunk/drivers/i2c/busses/i2c-designware-platdrv.c index c53a3127f694..2a596dd1ec66 100644 --- a/trunk/drivers/i2c/busses/i2c-designware-platdrv.c +++ b/trunk/drivers/i2c/busses/i2c-designware-platdrv.c @@ -56,20 +56,11 @@ static u32 i2c_dw_get_clk_rate_khz(struct dw_i2c_dev *dev) static int dw_i2c_acpi_configure(struct platform_device *pdev) { struct dw_i2c_dev *dev = platform_get_drvdata(pdev); - struct acpi_device *adev; - int busno, ret; if (!ACPI_HANDLE(&pdev->dev)) return -ENODEV; - ret = acpi_bus_get_device(ACPI_HANDLE(&pdev->dev), &adev); - if (ret) - return -ENODEV; - dev->adapter.nr = -1; - if (adev->pnp.unique_id && !kstrtoint(adev->pnp.unique_id, 0, &busno)) - dev->adapter.nr = busno; - dev->tx_fifo_depth = 32; dev->rx_fifo_depth = 32; return 0;