mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-06 00:39:48 +00:00
power: supply: bq24190_charger: drop of_match_ptr() from device ID table
The driver can match only via the DT table so the table should be always used and the of_match_ptr() does not have any sense (this also allows ACPI matching via PRP0001, even though it might be not relevant here). This fixes compile warning (!CONFIG_OF): drivers/power/supply/bq24190_charger.c:1972:34: warning: ‘bq24190_of_match’ defined but not used [-Wunused-const-variable=] Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
This commit is contained in:
parent
30e677a2ba
commit
df6f3f7eb7
1 changed files with 2 additions and 9 deletions
|
@ -5,11 +5,10 @@
|
||||||
* Author: Mark A. Greer <mgreer@animalcreek.com>
|
* Author: Mark A. Greer <mgreer@animalcreek.com>
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <linux/mod_devicetable.h>
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/interrupt.h>
|
#include <linux/interrupt.h>
|
||||||
#include <linux/delay.h>
|
#include <linux/delay.h>
|
||||||
#include <linux/of_irq.h>
|
|
||||||
#include <linux/of_device.h>
|
|
||||||
#include <linux/pm_runtime.h>
|
#include <linux/pm_runtime.h>
|
||||||
#include <linux/power_supply.h>
|
#include <linux/power_supply.h>
|
||||||
#include <linux/power/bq24190_charger.h>
|
#include <linux/power/bq24190_charger.h>
|
||||||
|
@ -1959,7 +1958,6 @@ static const struct i2c_device_id bq24190_i2c_ids[] = {
|
||||||
};
|
};
|
||||||
MODULE_DEVICE_TABLE(i2c, bq24190_i2c_ids);
|
MODULE_DEVICE_TABLE(i2c, bq24190_i2c_ids);
|
||||||
|
|
||||||
#ifdef CONFIG_OF
|
|
||||||
static const struct of_device_id bq24190_of_match[] = {
|
static const struct of_device_id bq24190_of_match[] = {
|
||||||
{ .compatible = "ti,bq24190", },
|
{ .compatible = "ti,bq24190", },
|
||||||
{ .compatible = "ti,bq24192", },
|
{ .compatible = "ti,bq24192", },
|
||||||
|
@ -1968,11 +1966,6 @@ static const struct of_device_id bq24190_of_match[] = {
|
||||||
{ },
|
{ },
|
||||||
};
|
};
|
||||||
MODULE_DEVICE_TABLE(of, bq24190_of_match);
|
MODULE_DEVICE_TABLE(of, bq24190_of_match);
|
||||||
#else
|
|
||||||
static const struct of_device_id bq24190_of_match[] = {
|
|
||||||
{ },
|
|
||||||
};
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static struct i2c_driver bq24190_driver = {
|
static struct i2c_driver bq24190_driver = {
|
||||||
.probe = bq24190_probe,
|
.probe = bq24190_probe,
|
||||||
|
@ -1981,7 +1974,7 @@ static struct i2c_driver bq24190_driver = {
|
||||||
.driver = {
|
.driver = {
|
||||||
.name = "bq24190-charger",
|
.name = "bq24190-charger",
|
||||||
.pm = &bq24190_pm_ops,
|
.pm = &bq24190_pm_ops,
|
||||||
.of_match_table = of_match_ptr(bq24190_of_match),
|
.of_match_table = bq24190_of_match,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
module_i2c_driver(bq24190_driver);
|
module_i2c_driver(bq24190_driver);
|
||||||
|
|
Loading…
Reference in a new issue