spi: omap: Allocate bus number from spi framework
authorSuniel Mahesh <sunil.m@techveda.org>
Fri, 18 Aug 2017 05:43:40 +0000 (11:13 +0530)
committerMark Brown <broonie@kernel.org>
Fri, 18 Aug 2017 11:15:41 +0000 (12:15 +0100)
spi framework should allocate bus number dynamically either
via Linux IDR or spi alias for master drivers. This patch deletes
code pertaining to manual allocation of spi bus number in spi omap2
master driver.

Signed-off-by: Suniel Mahesh <sunil.m@techveda.org>
Signed-off-by: Karthik Tummala <karthik@techveda.org>
Tested-by: Karthik Tummala <karthik@techveda.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-omap2-mcspi.c

index e048268d8ba25e58d8e23e0011f7470e7d99cbfe..9bf64e6eca9ba706b64e46a34fa9d0763680433d 100644 (file)
@@ -1338,7 +1338,6 @@ static int omap2_mcspi_probe(struct platform_device *pdev)
        struct resource         *r;
        int                     status = 0, i;
        u32                     regs_offset = 0;
        struct resource         *r;
        int                     status = 0, i;
        u32                     regs_offset = 0;
-       static int              bus_num = 1;
        struct device_node      *node = pdev->dev.of_node;
        const struct of_device_id *match;
 
        struct device_node      *node = pdev->dev.of_node;
        const struct of_device_id *match;
 
@@ -1374,14 +1373,11 @@ static int omap2_mcspi_probe(struct platform_device *pdev)
 
                of_property_read_u32(node, "ti,spi-num-cs", &num_cs);
                master->num_chipselect = num_cs;
 
                of_property_read_u32(node, "ti,spi-num-cs", &num_cs);
                master->num_chipselect = num_cs;
-               master->bus_num = bus_num++;
                if (of_get_property(node, "ti,pindir-d0-out-d1-in", NULL))
                        mcspi->pin_dir = MCSPI_PINDIR_D0_OUT_D1_IN;
        } else {
                pdata = dev_get_platdata(&pdev->dev);
                master->num_chipselect = pdata->num_cs;
                if (of_get_property(node, "ti,pindir-d0-out-d1-in", NULL))
                        mcspi->pin_dir = MCSPI_PINDIR_D0_OUT_D1_IN;
        } else {
                pdata = dev_get_platdata(&pdev->dev);
                master->num_chipselect = pdata->num_cs;
-               if (pdev->id != -1)
-                       master->bus_num = pdev->id;
                mcspi->pin_dir = pdata->pin_dir;
        }
        regs_offset = pdata->regs_offset;
                mcspi->pin_dir = pdata->pin_dir;
        }
        regs_offset = pdata->regs_offset;