[D/E/Unstable,4/5] Revert "UBUNTU: SAUCE: i2c: designware: Add disable runtime pm quirk"
diff mbox series

Message ID 20190813185654.6058-5-kai.heng.feng@canonical.com
State New
Headers show
Series
  • [E/Unstable,1/5] Revert "UBUNTU: SAUCE: i2c: designware: add G3 3590 into i2c quirk"
Related show

Commit Message

Kai-Heng Feng Aug. 13, 2019, 6:56 p.m. UTC
BugLink: https://bugs.launchpad.net/bugs/1840075

This reverts commit e2fedb6fddb6b1e886976cf8e97e575459fd7613.

Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
---
 drivers/i2c/busses/i2c-designware-master.c | 44 +---------------------
 1 file changed, 2 insertions(+), 42 deletions(-)

Patch
diff mbox series

diff --git a/drivers/i2c/busses/i2c-designware-master.c b/drivers/i2c/busses/i2c-designware-master.c
index 2b0f47b20b63..d464799e40a3 100644
--- a/drivers/i2c/busses/i2c-designware-master.c
+++ b/drivers/i2c/busses/i2c-designware-master.c
@@ -9,7 +9,6 @@ 
  * Copyright (C) 2009 Provigent Ltd.
  */
 #include <linux/delay.h>
-#include <linux/dmi.h>
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/export.h>
@@ -23,39 +22,6 @@ 
 
 #include "i2c-designware-core.h"
 
-static int no_runtime_pm;
-static const struct dmi_system_id i2c_dw_no_runtime_pm[] = {
-	{
-		.ident = "Dell Inspiron 5390",
-		.matches = {
-			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-			DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 5390"),
-		},
-	},
-	{
-		.ident = "Dell Inspiron 5391",
-		.matches = {
-			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-			DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 5391"),
-		},
-	},
-	{
-		.ident = "Dell Vostro 5390",
-		.matches = {
-			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-			DMI_MATCH(DMI_PRODUCT_NAME, "Vostro 5390"),
-		},
-	},
-	{
-		.ident = "Dell Vostro 5391",
-		.matches = {
-			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-			DMI_MATCH(DMI_PRODUCT_NAME, "Vostro 5391"),
-		},
-	},
-	{ }
-};
-
 static void i2c_dw_configure_fifo_master(struct dw_i2c_dev *dev)
 {
 	/* Configure Tx/Rx FIFO threshold levels */
@@ -458,8 +424,7 @@  i2c_dw_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
 
 	dev_dbg(dev->dev, "%s: msgs: %d\n", __func__, num);
 
-	if (!no_runtime_pm)
-		pm_runtime_get_sync(dev->dev);
+	pm_runtime_get_sync(dev->dev);
 
 	if (dev_WARN_ONCE(dev->dev, dev->suspended, "Transfer while suspended\n")) {
 		ret = -ESHUTDOWN;
@@ -536,8 +501,7 @@  i2c_dw_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
 
 done_nolock:
 	pm_runtime_mark_last_busy(dev->dev);
-	if (!no_runtime_pm)
-		pm_runtime_put_autosuspend(dev->dev);
+	pm_runtime_put_autosuspend(dev->dev);
 
 	return ret;
 }
@@ -769,10 +733,6 @@  int i2c_dw_probe(struct dw_i2c_dev *dev)
 	if (ret)
 		return ret;
 
-	no_runtime_pm = dmi_check_system(i2c_dw_no_runtime_pm);
-	if (no_runtime_pm)
-		__pm_runtime_disable(dev->dev, true);
-
 	/*
 	 * Increment PM usage count during adapter registration in order to
 	 * avoid possible spurious runtime suspend when adapter device is