|
@@ -184,20 +184,18 @@ static int ads1015_get_channels_config_of(struct i2c_client *client)
|
|
|
return -EINVAL;
|
|
|
|
|
|
for_each_child_of_node(client->dev.of_node, node) {
|
|
|
- const __be32 *property;
|
|
|
- int len;
|
|
|
+ u32 pval;
|
|
|
unsigned int channel;
|
|
|
unsigned int pga = ADS1015_DEFAULT_PGA;
|
|
|
unsigned int data_rate = ADS1015_DEFAULT_DATA_RATE;
|
|
|
|
|
|
- property = of_get_property(node, "reg", &len);
|
|
|
- if (!property || len != sizeof(int)) {
|
|
|
+ if (of_property_read_u32(node, "reg", &pval)) {
|
|
|
dev_err(&client->dev, "invalid reg on %s\n",
|
|
|
node->full_name);
|
|
|
continue;
|
|
|
}
|
|
|
|
|
|
- channel = be32_to_cpup(property);
|
|
|
+ channel = pval;
|
|
|
if (channel >= ADS1015_CHANNELS) {
|
|
|
dev_err(&client->dev,
|
|
|
"invalid channel index %d on %s\n",
|
|
@@ -205,20 +203,17 @@ static int ads1015_get_channels_config_of(struct i2c_client *client)
|
|
|
continue;
|
|
|
}
|
|
|
|
|
|
- property = of_get_property(node, "ti,gain", &len);
|
|
|
- if (property && len == sizeof(int)) {
|
|
|
- pga = be32_to_cpup(property);
|
|
|
+ if (!of_property_read_u32(node, "ti,gain", &pval)) {
|
|
|
+ pga = pval;
|
|
|
if (pga > 6) {
|
|
|
- dev_err(&client->dev,
|
|
|
- "invalid gain on %s\n",
|
|
|
+ dev_err(&client->dev, "invalid gain on %s\n",
|
|
|
node->full_name);
|
|
|
return -EINVAL;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- property = of_get_property(node, "ti,datarate", &len);
|
|
|
- if (property && len == sizeof(int)) {
|
|
|
- data_rate = be32_to_cpup(property);
|
|
|
+ if (!of_property_read_u32(node, "ti,datarate", &pval)) {
|
|
|
+ data_rate = pval;
|
|
|
if (data_rate > 7) {
|
|
|
dev_err(&client->dev,
|
|
|
"invalid data_rate on %s\n",
|