Skip to contentSkip to conversation

i2c: busses: Use dev_get_drvdata where possible

PATCH In review Chuhong Yuan 3 participants 3 messages Jul 23, 2019 – Jul 29, 2019

Subsystems (4)
I2C subsystem host drivers Intel LPSS (Low Power SubSystem) drivers I2C/smbus controller drivers for pc Synopsys DesignWare I2C driver
lore
Share & tools
lore

Chuhong Yuan

author
#0 lore raw

PATCH 1/1 i2c: busses: Use dev_get_drvdata where possible

Instead of using to_pci_dev + pci_get_drvdata,
use dev_get_drvdata to make code simpler.

Signed-off-by Chuhong Yuan <[email protected]>
---
 drivers/i2c/busses/i2c-designware-pcidrv.c | 6 ++----
 drivers/i2c/busses/i2c-i801.c              | 3 +--
 2 files changed, 3 insertions(+), 6 deletions(-)
drivers/i2c/busses/i2c-designware-pcidrv.c +2 -4
index 76810deb2de6..7d2e6959679c 100644
@@ -173,8 +173,7 @@ static struct dw_pci_controller dw_pci_controllers[] = {
 #ifdef CONFIG_PM
 static int i2c_dw_pci_suspend(struct device *dev)
 {
-	struct pci_dev *pdev = to_pci_dev(dev);
-	struct dw_i2c_dev *i_dev = pci_get_drvdata(pdev);
+	struct dw_i2c_dev *i_dev = dev_get_drvdata(dev);
 
 	i_dev->suspended = true;
 	i_dev->disable(i_dev);

@@ -184,8 +183,7 @@ static int i2c_dw_pci_suspend(struct device *dev)
 
 static int i2c_dw_pci_resume(struct device *dev)
 {
-	struct pci_dev *pdev = to_pci_dev(dev);
-	struct dw_i2c_dev *i_dev = pci_get_drvdata(pdev);
+	struct dw_i2c_dev *i_dev = dev_get_drvdata(dev);
 	int ret;
 
 	ret = i_dev->init(i_dev);
drivers/i2c/busses/i2c-i801.c +1 -2
index f2956936c3f2..a6469978e735 100644
@@ -1912,8 +1912,7 @@ static int i801_suspend(struct device *dev)
 
 static int i801_resume(struct device *dev)
 {
-	struct pci_dev *pci_dev = to_pci_dev(dev);
-	struct i801_priv *priv = pci_get_drvdata(pci_dev);
+	struct i801_priv *priv = dev_get_drvdata(dev);
 
 	i801_enable_host_notify(&priv->adapter);
Signature · 1 line
2.20.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 9 lines · Chuhong Yuan

Instead of using to_pci_dev + pci_get_drvdata,
use dev_get_drvdata to make code simpler.

Signed-off-by Chuhong Yuan <[email protected]>
---
 drivers/i2c/busses/i2c-designware-pcidrv.c | 6 ++----
 drivers/i2c/busses/i2c-i801.c              | 3 +--
 2 files changed, 3 insertions(+), 6 deletions(-)

(...)

Looks good to me, thanks.

Reviewed-by Jean Delvare <[email protected]>
Signature · 2 lines
Jean Delvare
SUSE L3 Support
Acked-by
#2 lore raw
Quoted 11 lines · Jean Delvare
Quoted 9 lines · Chuhong Yuan

Instead of using to_pci_dev + pci_get_drvdata,
use dev_get_drvdata to make code simpler.

Signed-off-by Chuhong Yuan <[email protected]>
---
  drivers/i2c/busses/i2c-designware-pcidrv.c | 6 ++----
  drivers/i2c/busses/i2c-i801.c              | 3 +--
  2 files changed, 3 insertions(+), 6 deletions(-)

(...)

Quoted 4 lines

Looks good to me, thanks.

Reviewed-by Jean Delvare <[email protected]>

For the i2c-designware-pcidrv.c

Acked-by Jarkko Nikula <[email protected]>