diff options
Diffstat (limited to 'drivers/hwmon')
-rw-r--r-- | drivers/hwmon/ams/ams-core.c | 6 | ||||
-rw-r--r-- | drivers/hwmon/ams/ams-i2c.c | 2 | ||||
-rw-r--r-- | drivers/hwmon/ams/ams-pmu.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/hwmon/ams/ams-core.c b/drivers/hwmon/ams/ams-core.c index f5ebad561412..dbe6a32c064e 100644 --- a/drivers/hwmon/ams/ams-core.c +++ b/drivers/hwmon/ams/ams-core.c | |||
@@ -144,7 +144,7 @@ int ams_sensor_attach(void) | |||
144 | const u32 *prop; | 144 | const u32 *prop; |
145 | 145 | ||
146 | /* Get orientation */ | 146 | /* Get orientation */ |
147 | prop = get_property(ams_info.of_node, "orientation", NULL); | 147 | prop = of_get_property(ams_info.of_node, "orientation", NULL); |
148 | if (!prop) | 148 | if (!prop) |
149 | return -ENODEV; | 149 | return -ENODEV; |
150 | ams_info.orient1 = *prop; | 150 | ams_info.orient1 = *prop; |
@@ -208,14 +208,14 @@ int __init ams_init(void) | |||
208 | 208 | ||
209 | #ifdef CONFIG_SENSORS_AMS_I2C | 209 | #ifdef CONFIG_SENSORS_AMS_I2C |
210 | np = of_find_node_by_name(NULL, "accelerometer"); | 210 | np = of_find_node_by_name(NULL, "accelerometer"); |
211 | if (np && device_is_compatible(np, "AAPL,accelerometer_1")) | 211 | if (np && of_device_is_compatible(np, "AAPL,accelerometer_1")) |
212 | /* Found I2C motion sensor */ | 212 | /* Found I2C motion sensor */ |
213 | return ams_i2c_init(np); | 213 | return ams_i2c_init(np); |
214 | #endif | 214 | #endif |
215 | 215 | ||
216 | #ifdef CONFIG_SENSORS_AMS_PMU | 216 | #ifdef CONFIG_SENSORS_AMS_PMU |
217 | np = of_find_node_by_name(NULL, "sms"); | 217 | np = of_find_node_by_name(NULL, "sms"); |
218 | if (np && device_is_compatible(np, "sms")) | 218 | if (np && of_device_is_compatible(np, "sms")) |
219 | /* Found PMU motion sensor */ | 219 | /* Found PMU motion sensor */ |
220 | return ams_pmu_init(np); | 220 | return ams_pmu_init(np); |
221 | #endif | 221 | #endif |
diff --git a/drivers/hwmon/ams/ams-i2c.c b/drivers/hwmon/ams/ams-i2c.c index 485d333bcb3e..ccd5cefae90e 100644 --- a/drivers/hwmon/ams/ams-i2c.c +++ b/drivers/hwmon/ams/ams-i2c.c | |||
@@ -276,7 +276,7 @@ int __init ams_i2c_init(struct device_node *np) | |||
276 | ams_info.bustype = BUS_I2C; | 276 | ams_info.bustype = BUS_I2C; |
277 | 277 | ||
278 | /* look for bus either using "reg" or by path */ | 278 | /* look for bus either using "reg" or by path */ |
279 | prop = get_property(ams_info.of_node, "reg", NULL); | 279 | prop = of_get_property(ams_info.of_node, "reg", NULL); |
280 | if (!prop) { | 280 | if (!prop) { |
281 | result = -ENODEV; | 281 | result = -ENODEV; |
282 | 282 | ||
diff --git a/drivers/hwmon/ams/ams-pmu.c b/drivers/hwmon/ams/ams-pmu.c index 1b01c215bfe7..9463e9768f6f 100644 --- a/drivers/hwmon/ams/ams-pmu.c +++ b/drivers/hwmon/ams/ams-pmu.c | |||
@@ -160,7 +160,7 @@ int __init ams_pmu_init(struct device_node *np) | |||
160 | ams_info.bustype = BUS_HOST; | 160 | ams_info.bustype = BUS_HOST; |
161 | 161 | ||
162 | /* Get PMU command, should be 0x4e, but we can never know */ | 162 | /* Get PMU command, should be 0x4e, but we can never know */ |
163 | prop = get_property(ams_info.of_node, "reg", NULL); | 163 | prop = of_get_property(ams_info.of_node, "reg", NULL); |
164 | if (!prop) { | 164 | if (!prop) { |
165 | result = -ENODEV; | 165 | result = -ENODEV; |
166 | goto exit; | 166 | goto exit; |