From: Sudeep Holla Date: Fri, 27 Mar 2020 16:36:54 +0000 (+0000) Subject: firmware: arm_scmi: Drop checking for shmem property in parent node X-Git-Tag: v5.8-rc1~138^2~26^2~12 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4e44590ee4a917df5ce557df4ad831ec5e82b4a6;p=linux.git firmware: arm_scmi: Drop checking for shmem property in parent node The scmi protocol core driver checks for the channel availability before evaluating the shmem property. If the individual protocols don't have separate channel assigned to them, the channel alloted for the BASE protocol is reused automatically. Therefore there is no need to check for the shmem property in the parent node if it is absent in the child protocol node. Link: https://lore.kernel.org/r/20200327163654.13389-5-sudeep.holla@arm.com Tested-by: Peng Fan Reviewed-by: Peng Fan Signed-off-by: Sudeep Holla --- diff --git a/drivers/firmware/arm_scmi/smc.c b/drivers/firmware/arm_scmi/smc.c index 5929c668dc1d..833e793b5391 100644 --- a/drivers/firmware/arm_scmi/smc.c +++ b/drivers/firmware/arm_scmi/smc.c @@ -60,8 +60,6 @@ static int smc_chan_setup(struct scmi_chan_info *cinfo, struct device *dev, return -ENOMEM; np = of_parse_phandle(cdev->of_node, "shmem", 0); - if (!np) - np = of_parse_phandle(dev->of_node, "shmem", 0); ret = of_address_to_resource(np, 0, &res); of_node_put(np); if (ret) {