mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-28 15:20:41 +00:00
spi/imx: remove autodetection
There are no machines in-tree that still use the driver name as device name. So save a few bytes and remove it. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Acked-by: Jason Wang <jason77.wang@gmail.com> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
This commit is contained in:
parent
752a4a95e3
commit
893421745a
1 changed files with 2 additions and 28 deletions
|
@ -66,7 +66,6 @@ enum spi_imx_devtype {
|
||||||
SPI_IMX_VER_0_5,
|
SPI_IMX_VER_0_5,
|
||||||
SPI_IMX_VER_0_7,
|
SPI_IMX_VER_0_7,
|
||||||
SPI_IMX_VER_2_3,
|
SPI_IMX_VER_2_3,
|
||||||
SPI_IMX_VER_AUTODETECT,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
struct spi_imx_data;
|
struct spi_imx_data;
|
||||||
|
@ -720,9 +719,6 @@ static void spi_imx_cleanup(struct spi_device *spi)
|
||||||
|
|
||||||
static struct platform_device_id spi_imx_devtype[] = {
|
static struct platform_device_id spi_imx_devtype[] = {
|
||||||
{
|
{
|
||||||
.name = DRIVER_NAME,
|
|
||||||
.driver_data = SPI_IMX_VER_AUTODETECT,
|
|
||||||
}, {
|
|
||||||
.name = "imx1-cspi",
|
.name = "imx1-cspi",
|
||||||
.driver_data = SPI_IMX_VER_IMX1,
|
.driver_data = SPI_IMX_VER_IMX1,
|
||||||
}, {
|
}, {
|
||||||
|
@ -802,30 +798,8 @@ static int __devinit spi_imx_probe(struct platform_device *pdev)
|
||||||
|
|
||||||
init_completion(&spi_imx->xfer_done);
|
init_completion(&spi_imx->xfer_done);
|
||||||
|
|
||||||
if (pdev->id_entry->driver_data == SPI_IMX_VER_AUTODETECT) {
|
spi_imx->devtype_data =
|
||||||
if (cpu_is_mx25() || cpu_is_mx35())
|
spi_imx_devtype_data[pdev->id_entry->driver_data];
|
||||||
spi_imx->devtype_data =
|
|
||||||
spi_imx_devtype_data[SPI_IMX_VER_0_7];
|
|
||||||
else if (cpu_is_mx25() || cpu_is_mx31() || cpu_is_mx35())
|
|
||||||
spi_imx->devtype_data =
|
|
||||||
spi_imx_devtype_data[SPI_IMX_VER_0_4];
|
|
||||||
else if (cpu_is_mx27() || cpu_is_mx21())
|
|
||||||
spi_imx->devtype_data =
|
|
||||||
spi_imx_devtype_data[SPI_IMX_VER_0_0];
|
|
||||||
else if (cpu_is_mx1())
|
|
||||||
spi_imx->devtype_data =
|
|
||||||
spi_imx_devtype_data[SPI_IMX_VER_IMX1];
|
|
||||||
else
|
|
||||||
BUG();
|
|
||||||
} else
|
|
||||||
spi_imx->devtype_data =
|
|
||||||
spi_imx_devtype_data[pdev->id_entry->driver_data];
|
|
||||||
|
|
||||||
if (!spi_imx->devtype_data.intctrl) {
|
|
||||||
dev_err(&pdev->dev, "no support for this device compiled in\n");
|
|
||||||
ret = -ENODEV;
|
|
||||||
goto out_gpio_free;
|
|
||||||
}
|
|
||||||
|
|
||||||
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||||
if (!res) {
|
if (!res) {
|
||||||
|
|
Loading…
Reference in a new issue