projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
hwmon
/
sht15.c
diff --git
a/drivers/hwmon/sht15.c
b/drivers/hwmon/sht15.c
index 2507f902fb7aa4ea450079a69bbbf8234e7e0ef4..97cd45a8432c03f7a87bceaac5bbe5c8e038683e 100644
(file)
--- a/
drivers/hwmon/sht15.c
+++ b/
drivers/hwmon/sht15.c
@@
-940,11
+940,11
@@
static int sht15_probe(struct platform_device *pdev)
data->dev = &pdev->dev;
init_waitqueue_head(&data->wait_queue);
data->dev = &pdev->dev;
init_waitqueue_head(&data->wait_queue);
- if (
pdev->dev.platform_data
== NULL) {
+ if (
dev_get_platdata(&pdev->dev)
== NULL) {
dev_err(&pdev->dev, "no platform data supplied\n");
return -EINVAL;
}
dev_err(&pdev->dev, "no platform data supplied\n");
return -EINVAL;
}
- data->pdata =
pdev->dev.platform_data
;
+ data->pdata =
dev_get_platdata(&pdev->dev)
;
data->supply_uv = data->pdata->supply_mv * 1000;
if (data->pdata->checksum)
data->checksumming = true;
data->supply_uv = data->pdata->supply_mv * 1000;
if (data->pdata->checksum)
data->checksumming = true;
@@
-957,7
+957,7
@@
static int sht15_probe(struct platform_device *pdev)
* If a regulator is available,
* query what the supply voltage actually is!
*/
* If a regulator is available,
* query what the supply voltage actually is!
*/
- data->reg = devm_regulator_get(data->dev, "vcc");
+ data->reg = devm_regulator_get
_optional
(data->dev, "vcc");
if (!IS_ERR(data->reg)) {
int voltage;
if (!IS_ERR(data->reg)) {
int voltage;