Skip to contentSkip to conversation

gpio: mpc8xxx: order headers alphabetically

PATCH Applied Bartosz Golaszewski 5 participants 9 messages Sep 3, 2024 – Sep 4, 2024 GPIO

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 gpio: mpc8xxx: order headers alphabetically

From: Bartosz Golaszewski <[email protected]>

Cleanup the includes by putting them in alphabetical order.

---
 drivers/gpio/gpio-mpc8xxx.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)
drivers/gpio/gpio-mpc8xxx.c +11 -11
index ab30c911c9d50..e084e08f54387 100644
@@ -7,19 +7,19 @@
  */
 
 #include <linux/acpi.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/spinlock.h>
-#include <linux/io.h>
-#include <linux/of.h>
-#include <linux/property.h>
-#include <linux/mod_devicetable.h>
-#include <linux/slab.h>
-#include <linux/irq.h>
-#include <linux/gpio/driver.h>
 #include <linux/bitops.h>
+#include <linux/gpio/driver.h>
+#include <linux/init.h>
 #include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/irq.h>
+#include <linux/kernel.h>
+#include <linux/mod_devicetable.h>
+#include <linux/of.h>
+#include <linux/platform_device.h>
+#include <linux/property.h>
+#include <linux/slab.h>
+#include <linux/spinlock.h>
 
 #define MPC8XXX_GPIO_PINS	32
 
Signature · 1 line
2.43.0
#1 lore raw

PATCH 2/2 gpio: mpc8xxx: switch to using DEFINE_RUNTIME_DEV_PM_OPS()

From: Bartosz Golaszewski <[email protected]>

Use the preferred API for assigning system sleep pm callbacks in drivers.

---
 drivers/gpio/gpio-mpc8xxx.c | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)
drivers/gpio/gpio-mpc8xxx.c +11 -13
index e084e08f54387..edb228d9af277 100644
@@ -17,6 +17,7 @@
 #include <linux/mod_devicetable.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
 #include <linux/property.h>
 #include <linux/slab.h>
 #include <linux/spinlock.h>
@@ -431,30 +432,28 @@ static void mpc8xxx_remove(struct platform_device *pdev)
 	}
 }
 
-#ifdef CONFIG_PM
-static int mpc8xxx_suspend(struct platform_device *pdev, pm_message_t state)
+static int mpc8xxx_suspend(struct device *dev)
 {
-	struct mpc8xxx_gpio_chip *mpc8xxx_gc = platform_get_drvdata(pdev);
+	struct mpc8xxx_gpio_chip *mpc8xxx_gc = dev_get_drvdata(dev);
 
-	if (mpc8xxx_gc->irqn && device_may_wakeup(&pdev->dev))
+	if (mpc8xxx_gc->irqn && device_may_wakeup(dev))
 		enable_irq_wake(mpc8xxx_gc->irqn);
 
 	return 0;
 }
 
-static int mpc8xxx_resume(struct platform_device *pdev)
+static int mpc8xxx_resume(struct device *dev)
 {
-	struct mpc8xxx_gpio_chip *mpc8xxx_gc = platform_get_drvdata(pdev);
+	struct mpc8xxx_gpio_chip *mpc8xxx_gc = dev_get_drvdata(dev);
 
-	if (mpc8xxx_gc->irqn && device_may_wakeup(&pdev->dev))
+	if (mpc8xxx_gc->irqn && device_may_wakeup(dev))
 		disable_irq_wake(mpc8xxx_gc->irqn);
 
 	return 0;
 }
-#else
-#define mpc8xxx_suspend NULL
-#define mpc8xxx_resume NULL
-#endif
+
+static DEFINE_RUNTIME_DEV_PM_OPS(mpc8xx_pm_ops, mpc8xxx_suspend,
+				 mpc8xxx_resume, NULL);
 
 #ifdef CONFIG_ACPI
 static const struct acpi_device_id gpio_acpi_ids[] = {
@@ -467,12 +466,11 @@ MODULE_DEVICE_TABLE(acpi, gpio_acpi_ids);
 static struct platform_driver mpc8xxx_plat_driver = {
 	.probe		= mpc8xxx_probe,
 	.remove_new	= mpc8xxx_remove,
-	.suspend	= mpc8xxx_suspend,
-	.resume		= mpc8xxx_resume,
 	.driver		= {
 		.name = "gpio-mpc8xxx",
 		.of_match_table	= mpc8xxx_gpio_ids,
 		.acpi_match_table = ACPI_PTR(gpio_acpi_ids),
+		.pm = pm_sleep_ptr(&mpc8xx_pm_ops),
 	},
 };
 
Signature · 1 line
2.43.0
#2 lore raw

Re: [PATCH 2/2] gpio: mpc8xxx: switch to using DEFINE_RUNTIME_DEV_PM_OPS()

Quoted 5 lines · Bartosz Golaszewski

From: Bartosz Golaszewski <[email protected]>

Use the preferred API for assigning system sleep pm callbacks in drivers.

Hmm... Maybe I should pay more attention when answering emails. Please, use my @linux.intel.com address for Linux kernel contributions.

...

Quoted 4 lines

#include <linux/mod_devicetable.h>
#include <linux/of.h>
#include <linux/platform_device.h>
+#include <linux/pm_runtime.h>

You need pm.h as macros defined there.

Quoted 3 lines

#include <linux/property.h>
#include <linux/slab.h>
#include <linux/spinlock.h>

...

drivers/gpio/gpio-mpc8xxx.c static void mpc8xxx_remove(struct platform_device *pdev) · line 456

Quoted 2 lines
drivers/gpio/gpio-mpc8xxx.c +2 -0
+static DEFINE_RUNTIME_DEV_PM_OPS(mpc8xx_pm_ops, mpc8xxx_suspend,
+				 mpc8xxx_resume, NULL);

I would split logically, i.e.

static DEFINE_RUNTIME_DEV_PM_OPS(mpc8xx_pm_ops,

				 mpc8xxx_suspend, mpc8xxx_resume, NULL);

OR

static DEFINE_RUNTIME_DEV_PM_OPS(mpc8xx_pm_ops,

				 mpc8xxx_suspend, mpc8xxx_resume,
				 NULL);
Signature · 2 lines
With Best Regards,
Andy Shevchenko
#3 lore raw

Re: [PATCH 2/2] gpio: mpc8xxx: switch to using DEFINE_RUNTIME_DEV_PM_OPS()

Quoted 1 line · Andy Shevchenko

On Tue, Sep 03, 2024 at 05:45:33PM +0200, Bartosz Golaszewski wrote:

...

Quoted 6 lines
Quoted 4 lines

#include <linux/mod_devicetable.h>
#include <linux/of.h>
#include <linux/platform_device.h>
+#include <linux/pm_runtime.h>

You need pm.h as macros defined there.

...or both...

Quoted 3 lines
Quoted 3 lines

#include <linux/property.h>
#include <linux/slab.h>
#include <linux/spinlock.h>

...

Quoted 2 lines

drivers/gpio/gpio-mpc8xxx.c static void mpc8xxx_remove(struct platform_device *pdev) · line 456

Quoted 2 lines
drivers/gpio/gpio-mpc8xxx.c +2 -0
+static DEFINE_RUNTIME_DEV_PM_OPS(mpc8xx_pm_ops, mpc8xxx_suspend,
+				 mpc8xxx_resume, NULL);

This one comes from pm_runtime.h, but pm*_ptr() ones from pm.h.

And it seems you wanted pm_ptr().

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#4 lore raw

Re: [PATCH 2/2] gpio: mpc8xxx: switch to using DEFINE_RUNTIME_DEV_PM_OPS()

Quoted 6 lines · Andy Shevchenko
Quoted 1 line · Andy Shevchenko

On Tue, Sep 03, 2024 at 05:45:33PM +0200, Bartosz Golaszewski wrote:

...

Quoted 9 lines
Quoted 6 lines
Quoted 4 lines

#include <linux/mod_devicetable.h>
#include <linux/of.h>
#include <linux/platform_device.h>
+#include <linux/pm_runtime.h>

You need pm.h as macros defined there.

...or both...

pm_runtime.h implies pm.h.

Quoted 4 lines
Quoted 3 lines
Quoted 3 lines

#include <linux/property.h>
#include <linux/slab.h>
#include <linux/spinlock.h>

Quoted 9 lines

...

Quoted 2 lines

drivers/gpio/gpio-mpc8xxx.c static void mpc8xxx_remove(struct platform_device *pdev) · line 456

Quoted 2 lines
drivers/gpio/gpio-mpc8xxx.c +2 -0
+static DEFINE_RUNTIME_DEV_PM_OPS(mpc8xx_pm_ops, mpc8xxx_suspend,
+                            mpc8xxx_resume, NULL);

This one comes from pm_runtime.h, but pm*_ptr() ones from pm.h.

And it seems you wanted pm_ptr().

Yeah, I'm not sure really. The suspend and resume callbacks for platform devices are not documented but it looks like they're only used for system sleep. Martyn: which one do we actually need?

Bart

Quoted 5 lines

--
With Best Regards,
Andy Shevchenko

#5 lore raw

Re: [PATCH 2/2] gpio: mpc8xxx: switch to using DEFINE_RUNTIME_DEV_PM_OPS()

Quoted 31 lines · Bartosz Golaszewski
Quoted 7 lines · Andy Shevchenko
Quoted 2 lines · Andy Shevchenko

On Tue, Sep 03, 2024 at 05:45:33PM +0200, Bartosz Golaszewski wrote:

...

Quoted 9 lines
Quoted 6 lines
Quoted 4 lines

 #include <linux/mod_devicetable.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
+#include <linux/pm_runtime.h>

You need pm.h as macros defined there.

...or both...

pm_runtime.h implies pm.h.

Quoted 10 lines
Quoted 3 lines
Quoted 3 lines

 #include <linux/property.h>
 #include <linux/slab.h>
 #include <linux/spinlock.h>

...

Quoted 3 lines
Quoted 3 lines

+static DEFINE_RUNTIME_DEV_PM_OPS(mpc8xx_pm_ops, mpc8xxx_suspend,
+                            mpc8xxx_resume, NULL);

Quoted 9 lines
Quoted 4 lines

This one comes from pm_runtime.h, but pm*_ptr() ones from pm.h.

And it seems you wanted pm_ptr().

Yeah, I'm not sure really. The suspend and resume callbacks for platform devices are not documented but it looks like they're only used for system sleep. Martyn: which one do we actually need?

Looking at commit 9d8619190031 (PM: runtime: Add DEFINE_RUNTIME_DEV_PM_OPS() macro), the use of DEFINE_RUNTIME_DEV_PM_OPS() sets up PM operations for all situations, not just sleeping, so I think we need pm_ptr() here.

I'd explicitly added the functionality for suspension due to sleep, though if a GPIO line is being used as some form of external interrupt, there may well be cases where it would be beneficial to be able to receive it in other low power states?

Martyn

Quoted 7 lines

Bart

Quoted 5 lines

--
With Best Regards,
Andy Shevchenko

Reviewed-by on v1 1/2
#7 lore raw
In reply to Bartosz Golaszewski
Quoted 42 lines · Bartosz Golaszewski

From: Bartosz Golaszewski <[email protected]>

Cleanup the includes by putting them in alphabetical order.

---
 drivers/gpio/gpio-mpc8xxx.c | 22 +++++++++++-----------

 1 file changed, 11 insertions(+), 11 deletions(-)
drivers/gpio/gpio- renamed from drivers/gpio/gpio-mpc8xxx.c +0 -0

mpc8xxx.c
index ab30c911c9d50..e084e08f54387 100644

drivers/gpio/gpio-mpc8xxx.c +0 -0
@@ -7,19 +7,19 @@
   */


 #include <linux/acpi.h>

drivers/gpio/gpio-mpc8xxx.c +0 -11
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/spinlock.h>
-#include <linux/io.h>
-#include <linux/of.h>
-#include <linux/property.h>
-#include <linux/mod_devicetable.h>
-#include <linux/slab.h>
-#include <linux/irq.h>
-#include <linux/gpio/driver.h>

 #include <linux/bitops.h>

drivers/gpio/gpio-mpc8xxx.c +2 -0
+#include <linux/gpio/driver.h>
+#include <linux/init.h>

 #include <linux/interrupt.h>

drivers/gpio/gpio-mpc8xxx.c +9 -0
+#include <linux/io.h>
+#include <linux/irq.h>
+#include <linux/kernel.h>
+#include <linux/mod_devicetable.h>
+#include <linux/of.h>
+#include <linux/platform_device.h>
+#include <linux/property.h>
+#include <linux/slab.h>
+#include <linux/spinlock.h>
Quoted 3 lines


 #define MPC8XXX_GPIO_PINS 32