hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

staging: iio: tsl2583: fix unused function warning 

Removing a call to the taos_chip_off() makes it unused when CONFIG_PM
is disabled:

drivers/staging/iio/light/tsl2583.c:438:12: error: ‘taos_chip_off’ defined but not used [-Werror=unused-function]

This removes all the #ifdef in this file, and marks the PM functions as
__maybe_unused instead, which is more reliable and gives us better
compile time coverage.

Fixes: 0561155f6f ("staging: iio: tsl2583: don't shutdown chip when updating the lux table")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
This commit is contained in:
Arnd Bergmann 2016-11-08 15:01:44 +01:00 committed by Jonathan Cameron
parent 6826fdbd2e
commit c266cda29a
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/staging/iio/light/tsl2583.c
View File

@ -816,8 +816,7 @@ static int taos_probe(struct i2c_client *clientp,
return 0; return 0;
} }
#ifdef CONFIG_PM_SLEEP static int __maybe_unused taos_suspend(struct device *dev)
static int taos_suspend(struct device *dev)
{ {
struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev)); struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev));
struct tsl2583_chip *chip = iio_priv(indio_dev); struct tsl2583_chip *chip = iio_priv(indio_dev);
@ -834,7 +833,7 @@ static int taos_suspend(struct device *dev)
return ret; return ret;
} }
static int taos_resume(struct device *dev) static int __maybe_unused taos_resume(struct device *dev)
{ {
struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev)); struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev));
struct tsl2583_chip *chip = iio_priv(indio_dev); struct tsl2583_chip *chip = iio_priv(indio_dev);
@ -850,10 +849,6 @@ static int taos_resume(struct device *dev)
} }
static SIMPLE_DEV_PM_OPS(taos_pm_ops, taos_suspend, taos_resume); static SIMPLE_DEV_PM_OPS(taos_pm_ops, taos_suspend, taos_resume);
#define TAOS_PM_OPS (&taos_pm_ops)
#else
#define TAOS_PM_OPS NULL
#endif
static struct i2c_device_id taos_idtable[] = { static struct i2c_device_id taos_idtable[] = {
{ "tsl2580", 0 }, { "tsl2580", 0 },
@ -863,7 +858,6 @@ static struct i2c_device_id taos_idtable[] = {
}; };
MODULE_DEVICE_TABLE(i2c, taos_idtable); MODULE_DEVICE_TABLE(i2c, taos_idtable);
#ifdef CONFIG_OF
static const struct of_device_id taos2583_of_match[] = { static const struct of_device_id taos2583_of_match[] = {
{ .compatible = "amstaos,tsl2580", }, { .compatible = "amstaos,tsl2580", },
{ .compatible = "amstaos,tsl2581", }, { .compatible = "amstaos,tsl2581", },
@ -871,15 +865,12 @@ static const struct of_device_id taos2583_of_match[] = {
{ }, { },
}; };
MODULE_DEVICE_TABLE(of, taos2583_of_match); MODULE_DEVICE_TABLE(of, taos2583_of_match);
#else
#define taos2583_of_match NULL
#endif
/* Driver definition */ /* Driver definition */
static struct i2c_driver taos_driver = { static struct i2c_driver taos_driver = {
.driver = { .driver = {
.name = "tsl2583", .name = "tsl2583",
.pm = TAOS_PM_OPS, .pm = &taos_pm_ops,
.of_match_table = taos2583_of_match, .of_match_table = taos2583_of_match,
}, },
.id_table = taos_idtable, .id_table = taos_idtable,