Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ee73c48 authored by Jarkko Nikula's avatar Jarkko Nikula Committed by Wolfram Sang
Browse files

i2c: i801: Convert to struct dev_pm_ops for suspend/resume 



Stop using legacy PCI PM support and convert to standard dev_pm_ops.
This provides more straightforward path to add runtime PM.

While at it remove explicit PCI power state control and configuration space
save/restore as the PCI core does it.

Signed-off-by: default avatarJarkko Nikula <jarkko.nikula@linux.intel.com>
Tested-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent 04f59143

drivers/i2c/busses/i2c-i801.c

+11 −13
Original line number Original line Diff line number Diff line
@@ -1433,34 +1433,32 @@ static void i801_remove(struct pci_dev *dev) 
}

}





#ifdef CONFIG_PM

#ifdef CONFIG_PM

static int i801_suspend(struct pci_dev *dev, pm_message_t mesg)

static int i801_suspend(struct device *dev)

{

{

	struct i801_priv *priv = pci_get_drvdata(dev);

	struct pci_dev *pci_dev = to_pci_dev(dev);

	struct i801_priv *priv = pci_get_drvdata(pci_dev);





	pci_save_state(dev);

	pci_write_config_byte(pci_dev, SMBHSTCFG, priv->original_hstcfg);

	pci_write_config_byte(dev, SMBHSTCFG, priv->original_hstcfg);

	pci_set_power_state(dev, pci_choose_state(dev, mesg));

	return 0;

	return 0;

}

}





static int i801_resume(struct pci_dev *dev)

static int i801_resume(struct device *dev)

{

{

	pci_set_power_state(dev, PCI_D0);

	pci_restore_state(dev);

	return 0;

	return 0;

}

}

#else

#define i801_suspend NULL

#define i801_resume NULL

#endif

#endif





static UNIVERSAL_DEV_PM_OPS(i801_pm_ops, i801_suspend,

			    i801_resume, NULL);



static struct pci_driver i801_driver = {

static struct pci_driver i801_driver = {

	.name		= "i801_smbus",

	.name		= "i801_smbus",

	.id_table	= i801_ids,

	.id_table	= i801_ids,

	.probe		= i801_probe,

	.probe		= i801_probe,

	.remove		= i801_remove,

	.remove		= i801_remove,

	.suspend	= i801_suspend,

	.driver		= {

	.resume		= i801_resume,

		.pm	= &i801_pm_ops,

	},

};

};





static int __init i2c_i801_init(void)

static int __init i2c_i801_init(void)