From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bjorn Helgaas Subject: [patch 13/53] PNPACPI: hoist dma_flags() out of pnpacpi_parse_allocated_dmaresource() Date: Fri, 18 Apr 2008 14:50:08 -0600 Message-ID: <20080418205049.850057335@ldl.fc.hp.com> References: <20080418204955.342963315@ldl.fc.hp.com> Return-path: Content-Disposition: inline; filename=pnpacpi-hoist-dma-flags Sender: linux-kernel-owner@vger.kernel.org To: Len Brown Cc: linux-acpi@vger.kernel.org, Rene Herman , linux-kernel@vger.kernel.org, Adam Belay , Li Shaohua , Matthieu Castet , Thomas Renninger , Rene Herman , Jaroslav Kysela , Andrew Morton List-Id: linux-acpi@vger.kernel.org Hoist dma_flags() out of pnpacpi_parse_allocated_dmaresource() into its caller. This makes pnpacpi_parse_allocated_dmaresource() more similar to pnpbios_parse_allocated_dmaresource(). Signed-off-by: Bjorn Helgaas Acked-By: Rene Herman Index: work7/drivers/pnp/pnpacpi/rsparser.c =================================================================== --- work7.orig/drivers/pnp/pnpacpi/rsparser.c 2008-03-21 15:08:36.000000000 -0600 +++ work7/drivers/pnp/pnpacpi/rsparser.c 2008-03-21 15:10:22.000000000 -0600 @@ -167,8 +167,7 @@ } static void pnpacpi_parse_allocated_dmaresource(struct pnp_resource_table *res, - u32 dma, int type, - int bus_master, int transfer) + u32 dma, int flags) { int i = 0; static unsigned char warned; @@ -178,8 +177,7 @@ i++; if (i < PNP_MAX_DMA) { res->dma_resource[i].flags = IORESOURCE_DMA; // Also clears _UNSET flag - res->dma_resource[i].flags |= - dma_flags(type, bus_master, transfer); + res->dma_resource[i].flags |= flags; if (dma == -1) { res->dma_resource[i].flags |= IORESOURCE_DISABLED; return; @@ -309,9 +307,8 @@ if (dma->channel_count > 0) pnpacpi_parse_allocated_dmaresource(res_table, dma->channels[0], - dma->type, - dma->bus_master, - dma->transfer); + dma_flags(dma->type, dma->bus_master, + dma->transfer)); break; case ACPI_RESOURCE_TYPE_IO: -- From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762608AbYDRU6v (ORCPT ); Fri, 18 Apr 2008 16:58:51 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758317AbYDRUwT (ORCPT ); Fri, 18 Apr 2008 16:52:19 -0400 Received: from g1t0027.austin.hp.com ([15.216.28.34]:20829 "EHLO g1t0027.austin.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758888AbYDRUvp (ORCPT ); Fri, 18 Apr 2008 16:51:45 -0400 Message-Id: <20080418205049.850057335@ldl.fc.hp.com> References: <20080418204955.342963315@ldl.fc.hp.com> User-Agent: quilt/0.46-1 Date: Fri, 18 Apr 2008 14:50:08 -0600 From: Bjorn Helgaas To: Len Brown Cc: linux-acpi@vger.kernel.org, Rene Herman Cc: linux-kernel@vger.kernel.org Cc: Adam Belay Cc: Li Shaohua Cc: Matthieu Castet Cc: Thomas Renninger Cc: Rene Herman Cc: Jaroslav Kysela Cc: Andrew Morton Subject: [patch 13/53] PNPACPI: hoist dma_flags() out of pnpacpi_parse_allocated_dmaresource() Content-Disposition: inline; filename=pnpacpi-hoist-dma-flags Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hoist dma_flags() out of pnpacpi_parse_allocated_dmaresource() into its caller. This makes pnpacpi_parse_allocated_dmaresource() more similar to pnpbios_parse_allocated_dmaresource(). Signed-off-by: Bjorn Helgaas Acked-By: Rene Herman Index: work7/drivers/pnp/pnpacpi/rsparser.c =================================================================== --- work7.orig/drivers/pnp/pnpacpi/rsparser.c 2008-03-21 15:08:36.000000000 -0600 +++ work7/drivers/pnp/pnpacpi/rsparser.c 2008-03-21 15:10:22.000000000 -0600 @@ -167,8 +167,7 @@ } static void pnpacpi_parse_allocated_dmaresource(struct pnp_resource_table *res, - u32 dma, int type, - int bus_master, int transfer) + u32 dma, int flags) { int i = 0; static unsigned char warned; @@ -178,8 +177,7 @@ i++; if (i < PNP_MAX_DMA) { res->dma_resource[i].flags = IORESOURCE_DMA; // Also clears _UNSET flag - res->dma_resource[i].flags |= - dma_flags(type, bus_master, transfer); + res->dma_resource[i].flags |= flags; if (dma == -1) { res->dma_resource[i].flags |= IORESOURCE_DISABLED; return; @@ -309,9 +307,8 @@ if (dma->channel_count > 0) pnpacpi_parse_allocated_dmaresource(res_table, dma->channels[0], - dma->type, - dma->bus_master, - dma->transfer); + dma_flags(dma->type, dma->bus_master, + dma->transfer)); break; case ACPI_RESOURCE_TYPE_IO: --