lkml.org 
[lkml]   [2011]   [Dec]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCHv2 RFC (repost) 06/16] mips: switch to GENERIC_PCI_IOMAP
    mips copied pci_iomap from generic code, probably to avoid
    pulling the rest of iomap.c in. Since that's in
    a separate file now, we can reuse the common implementation.

    Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
    ---
    arch/mips/Kconfig | 1 +
    arch/mips/lib/iomap-pci.c | 26 --------------------------
    2 files changed, 1 insertions(+), 26 deletions(-)

    diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
    index d46f1da..b70c96f 100644
    --- a/arch/mips/Kconfig
    +++ b/arch/mips/Kconfig
    @@ -2317,6 +2317,7 @@ config PCI
    bool "Support for PCI controller"
    depends on HW_HAS_PCI
    select PCI_DOMAINS
    + select GENERIC_PCI_IOMAP
    help
    Find out whether you have a PCI motherboard. PCI is the name of a
    bus system, i.e. the way the CPU talks to the other stuff inside
    diff --git a/arch/mips/lib/iomap-pci.c b/arch/mips/lib/iomap-pci.c
    index 2ab899c..2635b1a 100644
    --- a/arch/mips/lib/iomap-pci.c
    +++ b/arch/mips/lib/iomap-pci.c
    @@ -40,32 +40,6 @@ static void __iomem *ioport_map_pci(struct pci_dev *dev,
    return (void __iomem *) (ctrl->io_map_base + port);
    }

    -/*
    - * Create a virtual mapping cookie for a PCI BAR (memory or IO)
    - */
    -void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
    -{
    - resource_size_t start = pci_resource_start(dev, bar);
    - resource_size_t len = pci_resource_len(dev, bar);
    - unsigned long flags = pci_resource_flags(dev, bar);
    -
    - if (!len || !start)
    - return NULL;
    - if (maxlen && len > maxlen)
    - len = maxlen;
    - if (flags & IORESOURCE_IO)
    - return ioport_map_pci(dev, start, len);
    - if (flags & IORESOURCE_MEM) {
    - if (flags & IORESOURCE_CACHEABLE)
    - return ioremap(start, len);
    - return ioremap_nocache(start, len);
    - }
    - /* What? */
    - return NULL;
    -}
    -
    -EXPORT_SYMBOL(pci_iomap);
    -
    void pci_iounmap(struct pci_dev *dev, void __iomem * addr)
    {
    iounmap(addr);
    --
    1.7.8.382.g3daff


    \
     
     \ /
      Last update: 2011-12-21 17:31    [W:0.022 / U:181.140 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site