| Message ID | 1de49847-bb13-38b1-2820-15a7aa0fcb9a@gmail.com |
|---|---|
| State | Changes Requested |
| Delegated to: | Andi Shyti |
| Headers | show |
| Series | i2c: i801: next set of improvements | expand |
Hi Heiner, On Sat, Mar 04, 2023 at 10:37:34PM +0100, Heiner Kallweit wrote: > By using the newer macro DEFINE_SIMPLE_DEV_PM_OPS we can get rid > of the conditional compiling. > > Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> > --- > drivers/i2c/busses/i2c-i801.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c > index e1350a8cc..bd2349768 100644 > --- a/drivers/i2c/busses/i2c-i801.c > +++ b/drivers/i2c/busses/i2c-i801.c > @@ -1800,7 +1800,6 @@ static void i801_shutdown(struct pci_dev *dev) > pci_write_config_byte(dev, SMBHSTCFG, priv->original_hstcfg); > } > > -#ifdef CONFIG_PM_SLEEP > static int i801_suspend(struct device *dev) > { > struct i801_priv *priv = dev_get_drvdata(dev); > @@ -1821,9 +1820,8 @@ static int i801_resume(struct device *dev) > > return 0; > } > -#endif > > -static SIMPLE_DEV_PM_OPS(i801_pm_ops, i801_suspend, i801_resume); > +static DEFINE_SIMPLE_DEV_PM_OPS(i801_pm_ops, i801_suspend, i801_resume); > > static struct pci_driver i801_driver = { > .name = DRV_NAME, > @@ -1832,7 +1830,7 @@ static struct pci_driver i801_driver = { > .remove = i801_remove, > .shutdown = i801_shutdown, > .driver = { > - .pm = &i801_pm_ops, > + .pm = pm_sleep_ptr(&i801_pm_ops), Reviewed-by: Andi Shyti <andi.shyti@kernel.org> Andi
On Sat, 04 Mar 2023 22:37:34 +0100, Heiner Kallweit wrote: > By using the newer macro DEFINE_SIMPLE_DEV_PM_OPS we can get rid > of the conditional compiling. > > Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> > --- > drivers/i2c/busses/i2c-i801.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c > index e1350a8cc..bd2349768 100644 > --- a/drivers/i2c/busses/i2c-i801.c > +++ b/drivers/i2c/busses/i2c-i801.c > @@ -1800,7 +1800,6 @@ static void i801_shutdown(struct pci_dev *dev) > pci_write_config_byte(dev, SMBHSTCFG, priv->original_hstcfg); > } > > -#ifdef CONFIG_PM_SLEEP > static int i801_suspend(struct device *dev) > { > struct i801_priv *priv = dev_get_drvdata(dev); > @@ -1821,9 +1820,8 @@ static int i801_resume(struct device *dev) > > return 0; > } > -#endif > > -static SIMPLE_DEV_PM_OPS(i801_pm_ops, i801_suspend, i801_resume); > +static DEFINE_SIMPLE_DEV_PM_OPS(i801_pm_ops, i801_suspend, i801_resume); > > static struct pci_driver i801_driver = { > .name = DRV_NAME, > @@ -1832,7 +1830,7 @@ static struct pci_driver i801_driver = { > .remove = i801_remove, > .shutdown = i801_shutdown, > .driver = { > - .pm = &i801_pm_ops, > + .pm = pm_sleep_ptr(&i801_pm_ops), > .probe_type = PROBE_PREFER_ASYNCHRONOUS, > }, > }; Nice clean up. Reviewed-by: Jean Delvare <jdelvare@suse.de>
On Sat, Mar 04, 2023 at 10:37:34PM +0100, Heiner Kallweit wrote: > By using the newer macro DEFINE_SIMPLE_DEV_PM_OPS we can get rid > of the conditional compiling. > > Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> So, only this patch is left which only needs rebasing, right? Great work, guys, for keeping at it! Could you also kindly have a look for the remaining i801 patches from this year while we are at it? http://patchwork.ozlabs.org/project/linux-i2c/list/?series=&submitter=&state=&q=i801&archive=&delegate= Thanks everyone!
On 22.09.2023 11:54, Wolfram Sang wrote: > On Sat, Mar 04, 2023 at 10:37:34PM +0100, Heiner Kallweit wrote: >> By using the newer macro DEFINE_SIMPLE_DEV_PM_OPS we can get rid >> of the conditional compiling. >> >> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> > > So, only this patch is left which only needs rebasing, right? Great > work, guys, for keeping at it! Could you also kindly have a look for the > remaining i801 patches from this year while we are at it? > The same patch from another author has been applied in the meantime: a6273e413a9a ("i2c: i801: Remove #ifdef guards for PM related functions") So you can set my patch to superseeded. > http://patchwork.ozlabs.org/project/linux-i2c/list/?series=&submitter=&state=&q=i801&archive=&delegate= > > Thanks everyone! >
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c index e1350a8cc..bd2349768 100644 --- a/drivers/i2c/busses/i2c-i801.c +++ b/drivers/i2c/busses/i2c-i801.c @@ -1800,7 +1800,6 @@ static void i801_shutdown(struct pci_dev *dev) pci_write_config_byte(dev, SMBHSTCFG, priv->original_hstcfg); } -#ifdef CONFIG_PM_SLEEP static int i801_suspend(struct device *dev) { struct i801_priv *priv = dev_get_drvdata(dev); @@ -1821,9 +1820,8 @@ static int i801_resume(struct device *dev) return 0; } -#endif -static SIMPLE_DEV_PM_OPS(i801_pm_ops, i801_suspend, i801_resume); +static DEFINE_SIMPLE_DEV_PM_OPS(i801_pm_ops, i801_suspend, i801_resume); static struct pci_driver i801_driver = { .name = DRV_NAME, @@ -1832,7 +1830,7 @@ static struct pci_driver i801_driver = { .remove = i801_remove, .shutdown = i801_shutdown, .driver = { - .pm = &i801_pm_ops, + .pm = pm_sleep_ptr(&i801_pm_ops), .probe_type = PROBE_PREFER_ASYNCHRONOUS, }, };
By using the newer macro DEFINE_SIMPLE_DEV_PM_OPS we can get rid of the conditional compiling. Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> --- drivers/i2c/busses/i2c-i801.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)