[patch 13/53] PNPACPI: hoist dma_flags() out of pnpacpi_parse_allocated_dmaresource()

From: Bjorn Helgaas
Date: Fri Apr 18 2008 - 16:58:53 EST


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 <bjorn.helgaas@xxxxxx>
Acked-By: Rene Herman <rene.herman@xxxxxxxxx>

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:

--
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/