|
@@ -80,7 +80,6 @@ static void dw_i2c_acpi_params(struct platform_device *pdev, char method[],
|
|
|
static int dw_i2c_acpi_configure(struct platform_device *pdev)
|
|
|
{
|
|
|
struct dw_i2c_dev *dev = platform_get_drvdata(pdev);
|
|
|
- bool fs_mode = dev->master_cfg & DW_IC_CON_SPEED_FAST;
|
|
|
|
|
|
if (!ACPI_HANDLE(&pdev->dev))
|
|
|
return -ENODEV;
|
|
@@ -93,10 +92,9 @@ static int dw_i2c_acpi_configure(struct platform_device *pdev)
|
|
|
* Try to get SDA hold time and *CNT values from an ACPI method if
|
|
|
* it exists for both supported speed modes.
|
|
|
*/
|
|
|
- dw_i2c_acpi_params(pdev, "SSCN", &dev->ss_hcnt, &dev->ss_lcnt,
|
|
|
- fs_mode ? NULL : &dev->sda_hold_time);
|
|
|
+ dw_i2c_acpi_params(pdev, "SSCN", &dev->ss_hcnt, &dev->ss_lcnt, NULL);
|
|
|
dw_i2c_acpi_params(pdev, "FMCN", &dev->fs_hcnt, &dev->fs_lcnt,
|
|
|
- fs_mode ? &dev->sda_hold_time : NULL);
|
|
|
+ &dev->sda_hold_time);
|
|
|
|
|
|
return 0;
|
|
|
}
|