[PATCH] spi/imx: remove autodetection

[PATCH] spi/imx: remove autodetection

[Uwe Kleine-König]

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>
---
 drivers/spi/spi_imx.c |   30 ++----------------------------
 1 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/drivers/spi/spi_imx.c b/drivers/spi/spi_imx.c
index 55a38e2..9010ef0 100644
--- a/drivers/spi/spi_imx.c
+++ b/drivers/spi/spi_imx.c
@@ -66,7 +66,6 @@ enum spi_imx_devtype {
 	SPI_IMX_VER_0_5,
 	SPI_IMX_VER_0_7,
 	SPI_IMX_VER_2_3,
-	SPI_IMX_VER_AUTODETECT,
 };
 
 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[] = {
 	{
-		.name = DRIVER_NAME,
-		.driver_data = SPI_IMX_VER_AUTODETECT,
-	}, {
 		.name = "imx1-cspi",
 		.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);
 
-	if (pdev->id_entry->driver_data == SPI_IMX_VER_AUTODETECT) {
-		if (cpu_is_mx25() || cpu_is_mx35())
-			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;
-	}
+	spi_imx->devtype_data =
+		spi_imx_devtype_data[pdev->id_entry->driver_data];
 
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	if (!res) {
-- 
1.7.2.3


------------------------------------------------------------------------------
Increase Visibility of Your 3D Game App & Earn a Chance To Win $500!
Tap into the largest installed PC base & get more eyes on your game by
optimizing for Intel(R) Graphics Technology. Get started today with the
Intel(R) Software Partner Program. Five $500 cash prizes are up for grabs.
http://p.sf.net/sfu/intelisp-dev2dev
_______________________________________________
spi-devel-general mailing list
spi-devel-general@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/spi-devel-general

Re: [PATCH] spi/imx: remove autodetection

[Jason Wang]

It is reasonable, looks fine to me. :-)

Jason.

Uwe Kleine-König wrote:
> 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>
> ---
>  drivers/spi/spi_imx.c |   30 ++----------------------------
>  1 files changed, 2 insertions(+), 28 deletions(-)
>
> diff --git a/drivers/spi/spi_imx.c b/drivers/spi/spi_imx.c
> index 55a38e2..9010ef0 100644
> --- a/drivers/spi/spi_imx.c
> +++ b/drivers/spi/spi_imx.c
> @@ -66,7 +66,6 @@ enum spi_imx_devtype {
>  	SPI_IMX_VER_0_5,
>  	SPI_IMX_VER_0_7,
>  	SPI_IMX_VER_2_3,
> -	SPI_IMX_VER_AUTODETECT,
>  };
>  
>  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[] = {
>  	{
> -		.name = DRIVER_NAME,
> -		.driver_data = SPI_IMX_VER_AUTODETECT,
> -	}, {
>  		.name = "imx1-cspi",
>  		.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);
>  
> -	if (pdev->id_entry->driver_data == SPI_IMX_VER_AUTODETECT) {
> -		if (cpu_is_mx25() || cpu_is_mx35())
> -			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;
> -	}
> +	spi_imx->devtype_data =
> +		spi_imx_devtype_data[pdev->id_entry->driver_data];
>  
>  	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
>  	if (!res) {
>   


------------------------------------------------------------------------------
Increase Visibility of Your 3D Game App & Earn a Chance To Win $500!
Tap into the largest installed PC base & get more eyes on your game by
optimizing for Intel(R) Graphics Technology. Get started today with the
Intel(R) Software Partner Program. Five $500 cash prizes are up for grabs.
http://p.sf.net/sfu/intelisp-dev2dev
_______________________________________________
spi-devel-general mailing list
spi-devel-general@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/spi-devel-general

Re: [PATCH] spi/imx: remove autodetection

[Uwe Kleine-König]

On Thu, Nov 25, 2010 at 12:03:43PM +0800, Jason Wang wrote:
> It is reasonable, looks fine to me. :-)
>
> Jason.
I'll interpret this as an Ack.

Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

------------------------------------------------------------------------------
Increase Visibility of Your 3D Game App & Earn a Chance To Win $500!
Tap into the largest installed PC base & get more eyes on your game by
optimizing for Intel(R) Graphics Technology. Get started today with the
Intel(R) Software Partner Program. Five $500 cash prizes are up for grabs.
http://p.sf.net/sfu/intelisp-dev2dev

Re: [PATCH] spi/imx: remove autodetection

[Grant Likely]

On Thu, Nov 25, 2010 at 09:05:00AM +0100, Uwe Kleine-König wrote:
> On Thu, Nov 25, 2010 at 12:03:43PM +0800, Jason Wang wrote:
> > It is reasonable, looks fine to me. :-)
> >
> > Jason.
> I'll interpret this as an Ack.

So will I.  :-)

applied for -next

g.


------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and, 
should the need arise, upgrade to a full multi-node Oracle RAC database 
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl