lkml.org 
[lkml]   [2008]   [Apr]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 14/55] 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>

    Index: work10/drivers/pnp/pnpacpi/rsparser.c
    ===================================================================
    --- work10.orig/drivers/pnp/pnpacpi/rsparser.c 2008-04-28 16:09:16.000000000 -0600
    +++ work10/drivers/pnp/pnpacpi/rsparser.c 2008-04-28 16:09:17.000000000 -0600
    @@ -169,8 +169,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;
    @@ -180,8 +179,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;
    @@ -311,9 +309,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:
    --


    \
     
     \ /
      Last update: 2008-04-29 00:47    [W:0.052 / U:0.424 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site