mtd: rawnand: davinci: stop using pdev->id as chipselect

All platform now use the core_chipsel field in platform data. Stop
using pdev->id in the driver.

Acked-by: Boris Brezillon <boris.brezillon@bootlin.com>
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>

diff --git a/drivers/mtd/nand/raw/davinci_nand.c b/drivers/mtd/nand/raw/davinci_nand.c
index 0f09518..0797abe 100644 (file)
--- a/drivers/mtd/nand/raw/davinci_nand.c
+++ b/drivers/mtd/nand/raw/davinci_nand.c
@@ -547,7 +547,7 @@ static struct davinci_nand_pdata
                        return ERR_PTR(-ENOMEM);
                if (!of_property_read_u32(pdev->dev.of_node,
                        "ti,davinci-chipselect", &prop))
-                       pdev->id = prop;
+                       pdata->core_chipsel = prop;
                else
                        return ERR_PTR(-EINVAL);
 
@@ -629,7 +629,7 @@ static int nand_davinci_probe(struct platform_device *pdev)
                return -ENODEV;
 
        /* which external chipselect will we be managing? */
-       if (pdev->id < 0 || pdev->id > 3)
+       if (pdata->core_chipsel < 0 || pdata->core_chipsel > 3)
                return -ENODEV;
 
        info = devm_kzalloc(&pdev->dev, sizeof(*info), GFP_KERNEL);
@@ -685,7 +685,7 @@ static int nand_davinci_probe(struct platform_device *pdev)
        info->ioaddr            = (uint32_t __force) vaddr;
 
        info->current_cs        = info->ioaddr;
-       info->core_chipsel      = pdev->id;
+       info->core_chipsel      = pdata->core_chipsel;
        info->mask_chipsel      = pdata->mask_chipsel;
 
        /* use nandboot-capable ALE/CLE masks by default */