summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAbhishek Sahu <absahu@codeaurora.org>2017-07-19 17:17:53 +0530
committerBoris Brezillon <boris.brezillon@free-electrons.com>2017-08-23 16:49:15 +0200
commite806423aca5bf52b1e14e83befa9d4bac8c17ee1 (patch)
tree83939651f8d6639d4918a88a1043001e9a5e9693
parent10777de570016471fd929869c7830a7772893e39 (diff)
downloadlinux-stable-e806423aca5bf52b1e14e83befa9d4bac8c17ee1.tar.gz
linux-stable-e806423aca5bf52b1e14e83befa9d4bac8c17ee1.tar.bz2
linux-stable-e806423aca5bf52b1e14e83befa9d4bac8c17ee1.zip
mtd: nand: qcom: remove redundant chip select compatible string
Currently the compatible “qcom,nandcs” is being used for each connected NAND device to support for multiple NAND devices in the same bus. The same thing can be achieved by looking reg property for each sub nodes which contains the chip select number so this patch removes the use of “qcom,nandcs” for specifying NAND device sub nodes. Since there is no user for this driver currently in so changing compatible string is safe. Signed-off-by: Abhishek Sahu <absahu@codeaurora.org> Reviewed-by: Archit Taneja <architt@codeaurora.org> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
-rw-r--r--drivers/mtd/nand/qcom_nandc.c26
1 files changed, 12 insertions, 14 deletions
diff --git a/drivers/mtd/nand/qcom_nandc.c b/drivers/mtd/nand/qcom_nandc.c
index 9c4c1ccb5d0f..ec5ec2c4b688 100644
--- a/drivers/mtd/nand/qcom_nandc.c
+++ b/drivers/mtd/nand/qcom_nandc.c
@@ -2127,22 +2127,20 @@ static int qcom_nandc_probe(struct platform_device *pdev)
goto err_setup;
for_each_available_child_of_node(dn, child) {
- if (of_device_is_compatible(child, "qcom,nandcs")) {
- host = devm_kzalloc(dev, sizeof(*host), GFP_KERNEL);
- if (!host) {
- of_node_put(child);
- ret = -ENOMEM;
- goto err_cs_init;
- }
-
- ret = qcom_nand_host_init(nandc, host, child);
- if (ret) {
- devm_kfree(dev, host);
- continue;
- }
+ host = devm_kzalloc(dev, sizeof(*host), GFP_KERNEL);
+ if (!host) {
+ of_node_put(child);
+ ret = -ENOMEM;
+ goto err_cs_init;
+ }
- list_add_tail(&host->node, &nandc->host_list);
+ ret = qcom_nand_host_init(nandc, host, child);
+ if (ret) {
+ devm_kfree(dev, host);
+ continue;
}
+
+ list_add_tail(&host->node, &nandc->host_list);
}
if (list_empty(&nandc->host_list)) {