Commit bb84b41d authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Len Brown

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: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Acked-By: default avatarRene Herman <rene.herman@gmail.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 9570a20e
...@@ -169,8 +169,7 @@ static int dma_flags(int type, int bus_master, int transfer) ...@@ -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, static void pnpacpi_parse_allocated_dmaresource(struct pnp_resource_table *res,
u32 dma, int type, u32 dma, int flags)
int bus_master, int transfer)
{ {
int i = 0; int i = 0;
static unsigned char warned; static unsigned char warned;
...@@ -180,8 +179,7 @@ static void pnpacpi_parse_allocated_dmaresource(struct pnp_resource_table *res, ...@@ -180,8 +179,7 @@ static void pnpacpi_parse_allocated_dmaresource(struct pnp_resource_table *res,
i++; i++;
if (i < PNP_MAX_DMA) { if (i < PNP_MAX_DMA) {
res->dma_resource[i].flags = IORESOURCE_DMA; // Also clears _UNSET flag res->dma_resource[i].flags = IORESOURCE_DMA; // Also clears _UNSET flag
res->dma_resource[i].flags |= res->dma_resource[i].flags |= flags;
dma_flags(type, bus_master, transfer);
if (dma == -1) { if (dma == -1) {
res->dma_resource[i].flags |= IORESOURCE_DISABLED; res->dma_resource[i].flags |= IORESOURCE_DISABLED;
return; return;
...@@ -311,9 +309,8 @@ static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res, ...@@ -311,9 +309,8 @@ static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res,
if (dma->channel_count > 0) if (dma->channel_count > 0)
pnpacpi_parse_allocated_dmaresource(res_table, pnpacpi_parse_allocated_dmaresource(res_table,
dma->channels[0], dma->channels[0],
dma->type, dma_flags(dma->type, dma->bus_master,
dma->bus_master, dma->transfer));
dma->transfer);
break; break;
case ACPI_RESOURCE_TYPE_IO: case ACPI_RESOURCE_TYPE_IO:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment