dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

PNPACPI: hoist dma_flags() out of pnpacpi_parse_allocated_dmaresource() 

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@hp.com>
Acked-By: Rene Herman <rene.herman@gmail.com>
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Bjorn Helgaas 2008-04-28 16:34:01 -06:00 committed by Len Brown
parent 9570a20e9d
commit bb84b41d1a
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/pnp/pnpacpi/rsparser.c
View File

@ -169,8 +169,7 @@ static int dma_flags(int type, int bus_master, int transfer)
}
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;
@ -180,8 +179,7 @@ static void pnpacpi_parse_allocated_dmaresource(struct pnp_resource_table *res,
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;
@ -311,9 +309,8 @@ static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res,
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: