Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

iio:accel:kxsd9: Switch from CONFIG_PM guards to pm_ptr() etc

Letting the compiler remove these functions when the kernel is built
without CONFIG_PM support is simpler and less error prone than the
use of #ifdef based config guards.

Removing instances of this approach from IIO also stops them being
copied into new drivers.

Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Link: https://lore.kernel.org/r/20220220181522.541718-5-jic23@kernel.org
Link: https://lore.kernel.org/r/20220604161223.461847-2-jic23@kernel.org

+4 -11
+1 -1
drivers/iio/accel/kxsd9-i2c.c
··· 55 55 .driver = { 56 56 .name = "kxsd9", 57 57 .of_match_table = kxsd9_of_match, 58 - .pm = &kxsd9_dev_pm_ops, 58 + .pm = pm_ptr(&kxsd9_dev_pm_ops), 59 59 }, 60 60 .probe = kxsd9_i2c_probe, 61 61 .remove = kxsd9_i2c_remove,
+1 -1
drivers/iio/accel/kxsd9-spi.c
··· 52 52 static struct spi_driver kxsd9_spi_driver = { 53 53 .driver = { 54 54 .name = "kxsd9", 55 - .pm = &kxsd9_dev_pm_ops, 55 + .pm = pm_ptr(&kxsd9_dev_pm_ops), 56 56 .of_match_table = kxsd9_of_match, 57 57 }, 58 58 .probe = kxsd9_spi_probe,
+2 -9
drivers/iio/accel/kxsd9.c
··· 492 492 } 493 493 EXPORT_SYMBOL_NS(kxsd9_common_remove, IIO_KXSD9); 494 494 495 - #ifdef CONFIG_PM 496 495 static int kxsd9_runtime_suspend(struct device *dev) 497 496 { 498 497 struct iio_dev *indio_dev = dev_get_drvdata(dev); ··· 507 508 508 509 return kxsd9_power_up(st); 509 510 } 510 - #endif /* CONFIG_PM */ 511 511 512 - const struct dev_pm_ops kxsd9_dev_pm_ops = { 513 - SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, 514 - pm_runtime_force_resume) 515 - SET_RUNTIME_PM_OPS(kxsd9_runtime_suspend, 516 - kxsd9_runtime_resume, NULL) 517 - }; 518 - EXPORT_SYMBOL_NS(kxsd9_dev_pm_ops, IIO_KXSD9); 512 + EXPORT_NS_RUNTIME_DEV_PM_OPS(kxsd9_dev_pm_ops, kxsd9_runtime_suspend, 513 + kxsd9_runtime_resume, NULL, IIO_KXSD9); 519 514 520 515 MODULE_AUTHOR("Jonathan Cameron <jic23@kernel.org>"); 521 516 MODULE_DESCRIPTION("Kionix KXSD9 driver");