Commit 03b758ba authored by Sebastian Reichel's avatar Sebastian Reichel Committed by Sebastian Reichel

power: supply: sbs-battery: switch from of_property_* to device_property_*

Switch from DT specific of_property_* API to generic and more
modern device_property_* API.
Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
parent 182fc882
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/of.h> #include <linux/property.h>
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/power/sbs-battery.h> #include <linux/power/sbs-battery.h>
#include <linux/power_supply.h> #include <linux/power_supply.h>
...@@ -1016,7 +1016,7 @@ static int sbs_probe(struct i2c_client *client, ...@@ -1016,7 +1016,7 @@ static int sbs_probe(struct i2c_client *client,
if (!chip) if (!chip)
return -ENOMEM; return -ENOMEM;
chip->flags = (u32)(uintptr_t)of_device_get_match_data(&client->dev); chip->flags = (u32)(uintptr_t)device_get_match_data(&client->dev);
chip->client = client; chip->client = client;
chip->enable_detection = false; chip->enable_detection = false;
psy_cfg.of_node = client->dev.of_node; psy_cfg.of_node = client->dev.of_node;
...@@ -1027,13 +1027,13 @@ static int sbs_probe(struct i2c_client *client, ...@@ -1027,13 +1027,13 @@ static int sbs_probe(struct i2c_client *client,
/* use pdata if available, fall back to DT properties, /* use pdata if available, fall back to DT properties,
* or hardcoded defaults if not * or hardcoded defaults if not
*/ */
rc = of_property_read_u32(client->dev.of_node, "sbs,i2c-retry-count", rc = device_property_read_u32(&client->dev, "sbs,i2c-retry-count",
&chip->i2c_retry_count); &chip->i2c_retry_count);
if (rc) if (rc)
chip->i2c_retry_count = 0; chip->i2c_retry_count = 0;
rc = of_property_read_u32(client->dev.of_node, "sbs,poll-retry-count", rc = device_property_read_u32(&client->dev, "sbs,poll-retry-count",
&chip->poll_retry_count); &chip->poll_retry_count);
if (rc) if (rc)
chip->poll_retry_count = 0; chip->poll_retry_count = 0;
...@@ -1043,7 +1043,7 @@ static int sbs_probe(struct i2c_client *client, ...@@ -1043,7 +1043,7 @@ static int sbs_probe(struct i2c_client *client,
} }
chip->i2c_retry_count = chip->i2c_retry_count + 1; chip->i2c_retry_count = chip->i2c_retry_count + 1;
chip->charger_broadcasts = !of_property_read_bool(client->dev.of_node, chip->charger_broadcasts = !device_property_read_bool(&client->dev,
"sbs,disable-charger-broadcasts"); "sbs,disable-charger-broadcasts");
chip->gpio_detect = devm_gpiod_get_optional(&client->dev, chip->gpio_detect = devm_gpiod_get_optional(&client->dev,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment