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>
}
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,
- int bus_master, int transfer)
{
int i = 0;
static unsigned char warned;
{
int i = 0;
static unsigned char warned;
i++;
if (i < PNP_MAX_DMA) {
res->dma_resource[i].flags = IORESOURCE_DMA; // Also clears _UNSET flag
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;
if (dma == -1) {
res->dma_resource[i].flags |= IORESOURCE_DISABLED;
return;
if (dma->channel_count > 0)
pnpacpi_parse_allocated_dmaresource(res_table,
dma->channels[0],
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:
break;
case ACPI_RESOURCE_TYPE_IO: