RE: [PATCH] Simplify yenta code

[Komuro <komurojun@nifty.com>]

Hello,

Unfortunately, your patch is wrong,
and does not results in the same run-time behaviour.

You broke the code of "if (type & IORESOURCE_IO)"
 

Best Regards
Komuro


>Simplify some of the resource detection logic in yenta_socket.
>This patch results in the same run-time behaviour as the 
>current code, but does so with fewer lines of code. This
>makes the logical flow of the code a bit easier to understand.
>
>Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
>Cc: Dominik Brodowski <linux@brodo.de>
>
>----
> drivers/pcmcia/yenta_socket.c |   22 ++++++++--------------
> 1 file changed, 8 insertions(+), 14 deletions(-)
>
>Index: linux-2.6.23-rc8-mm1/drivers/pcmcia/yenta_socket.c
>===================================================================
>--- linux-2.6.23-rc8-mm1.orig/drivers/pcmcia/yenta_socket.c	2007-10-01 >12:17:02.000000000 -0500
>+++ linux-2.6.23-rc8-mm1/drivers/pcmcia/yenta_socket.c	2007-10-01 12:37:36.000000000 >-0500
>@@ -654,20 +654,14 @@ static int yenta_allocate_res(struct yen
> 				pci_name(socket->dev), nr);
> 	}
> 
>-	if (type & IORESOURCE_IO) {
>-		if ((yenta_search_res(socket, res, BRIDGE_IO_MAX)) ||
>-		    (yenta_search_res(socket, res, BRIDGE_IO_ACC)) ||
>-		    (yenta_search_res(socket, res, BRIDGE_IO_MIN)))
>-			return 1;
>-	} else {
>-		if (type & IORESOURCE_PREFETCH) {
>-			if ((yenta_search_res(socket, res, BRIDGE_MEM_MAX)) ||
>-			    (yenta_search_res(socket, res, BRIDGE_MEM_ACC)) ||
>-			    (yenta_search_res(socket, res, BRIDGE_MEM_MIN)))
>-				return 1;
>-			/* Approximating prefetchable by non-prefetchable */
>-			res->flags = IORESOURCE_MEM;
>-		}
>+	if ((yenta_search_res(socket, res, BRIDGE_MEM_MAX)) ||
>+	    (yenta_search_res(socket, res, BRIDGE_MEM_ACC)) ||
>+	    (yenta_search_res(socket, res, BRIDGE_MEM_MIN)))
>+		return 1;
>+
>+	if (type & IORESOURCE_PREFETCH) {
>+		/* Approximating prefetchable by non-prefetchable */
>+		res->flags = IORESOURCE_MEM;
> 		if ((yenta_search_res(socket, res, BRIDGE_MEM_MAX)) ||
> 		    (yenta_search_res(socket, res, BRIDGE_MEM_ACC)) ||
> 		    (yenta_search_res(socket, res, BRIDGE_MEM_MIN)))
>-