lkml.org 
[lkml]   [2015]   [Oct]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v7 52/60] PCI: Kill macro checking for bus io port sizing
    Date
    We can use new generic version skip_isa_ioresource_align() instead
    of macro, and then kill the marco.

    Signed-off-by: Yinghai Lu <yinghai@kernel.org>
    ---
    drivers/pci/setup-bus.c | 17 +++++++----------
    1 file changed, 7 insertions(+), 10 deletions(-)

    diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
    index f1c7b46..419eaaf 100644
    --- a/drivers/pci/setup-bus.c
    +++ b/drivers/pci/setup-bus.c
    @@ -1160,15 +1160,12 @@ int skip_isa_ioresource_align(struct pci_bus *bus)
    return 0;
    }

    -static resource_size_t size_aligned_for_isa(resource_size_t size)
    +static resource_size_t size_aligned_for_isa(resource_size_t size,
    + struct pci_bus *bus)
    {
    - /*
    - * To be fixed in 2.5: we should have sort of HAVE_ISA
    - * flag in the struct pci_bus.
    - */
    -#if defined(CONFIG_ISA) || defined(CONFIG_EISA)
    - size = (size & 0xff) + ((size & ~0xffUL) << 2);
    -#endif
    + if (!skip_isa_ioresource_align(bus))
    + size = (size & 0xff) + ((size & ~0xffUL) << 2);
    +
    return size;
    }

    @@ -1237,12 +1234,12 @@ static void pbus_size_io(struct pci_bus *bus, resource_size_t min_size,
    }
    }

    - size = size_aligned_for_isa(size);
    + size = size_aligned_for_isa(size, bus);
    size += size1;
    if (size || min_size)
    size0 = calculate_size(size, min_size,
    resource_size(b_res), min_align);
    - sum_add_size = size_aligned_for_isa(sum_add_size);
    + sum_add_size = size_aligned_for_isa(sum_add_size, bus);
    sum_add_size += sum_add_size1;
    if (sum_add_size < min_sum_size)
    sum_add_size = min_sum_size;
    --
    1.8.4.5


    \
     
     \ /
      Last update: 2015-10-09 00:01    [W:4.421 / U:0.248 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site