提交 f59a3977 编写于 作者: P Phil Elwell 提交者: Zheng Zengkai

gpio-fsm: Rename 'num-soft-gpios' to avoid warning

raspberrypi inclusion
category: feature
bugzilla: 50432

--------------------------------

As of 5.10, the Device Tree parser warns about properties that look
like references to "suppliers" of various services. "num-soft-gpios"
resembles a declaration of a GPIO called "num-soft", causing the value
to be interpreted as a phandle, the owner of which is checked for a
"#gpio-cells" property.

To avoid this warning, rename the gpio-fsm property to "num-swgpios".
Signed-off-by: NPhil Elwell <phil@raspberrypi.com>
Signed-off-by: NFang Yafen <yafen@iscas.ac.cn>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
上级 5aec88d5
...@@ -866,8 +866,9 @@ static int gpio_fsm_probe(struct platform_device *pdev) ...@@ -866,8 +866,9 @@ static int gpio_fsm_probe(struct platform_device *pdev)
[SYM_SHUTDOWN] = "shutdown_state", [SYM_SHUTDOWN] = "shutdown_state",
}; };
if (of_property_read_u32(np, "num-soft-gpios", &num_soft_gpios)) { if (of_property_read_u32(np, "num-swgpios", &num_soft_gpios) &&
dev_err(dev, "missing 'num-soft-gpios' property\n"); of_property_read_u32(np, "num-soft-gpios", &num_soft_gpios)) {
dev_err(dev, "missing 'num-swgpios' property\n");
return -EINVAL; return -EINVAL;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册