lkml.org 
[lkml]   [2008]   [Apr]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 32/53] PNP: remove PNP_MAX_* uses
    Remove some PNP_MAX_* uses.  The pnp_resource_table isn't
    dynamic yet, but with pnp_get_resource(), we can start moving
    away from the table size constants.

    Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
    Acked-By: Rene Herman <rene.herman@gmail.com>

    ---
    drivers/pnp/interface.c | 43 ++++++++++++++++++------------------
    drivers/pnp/quirks.c | 13 ++++++-----
    drivers/pnp/resource.c | 56 +++++++++++++++++++++++++++---------------------
    drivers/pnp/system.c | 21 ++++++++----------
    4 files changed, 70 insertions(+), 63 deletions(-)

    Index: work8/drivers/pnp/interface.c
    ===================================================================
    --- work8.orig/drivers/pnp/interface.c 2008-04-10 16:21:52.000000000 -0600
    +++ work8/drivers/pnp/interface.c 2008-04-10 16:28:56.000000000 -0600
    @@ -243,11 +243,14 @@

    static DEVICE_ATTR(options, S_IRUGO, pnp_show_options, NULL);

    +#define set(flags) ((flags & IORESOURCE_UNSET) == 0)
    +
    static ssize_t pnp_show_current_resources(struct device *dmdev,
    struct device_attribute *attr,
    char *buf)
    {
    struct pnp_dev *dev = to_pnp_dev(dmdev);
    + struct resource *res;
    int i, ret;
    pnp_info_buffer_t *buffer;

    @@ -267,50 +270,46 @@
    else
    pnp_printf(buffer, "disabled\n");

    - for (i = 0; i < PNP_MAX_PORT; i++) {
    - if (pnp_port_valid(dev, i)) {
    + for (i = 0; (res = pnp_get_resource(dev, IORESOURCE_IO, i)); i++) {
    + if (set(res->flags)) {
    pnp_printf(buffer, "io");
    - if (pnp_port_flags(dev, i) & IORESOURCE_DISABLED)
    + if (res->flags & IORESOURCE_DISABLED)
    pnp_printf(buffer, " disabled\n");
    else
    pnp_printf(buffer, " 0x%llx-0x%llx\n",
    - (unsigned long long)
    - pnp_port_start(dev, i),
    - (unsigned long long)pnp_port_end(dev,
    - i));
    + (unsigned long long) res->start,
    + (unsigned long long) res->end);
    }
    }
    - for (i = 0; i < PNP_MAX_MEM; i++) {
    - if (pnp_mem_valid(dev, i)) {
    + for (i = 0; (res = pnp_get_resource(dev, IORESOURCE_MEM, i)); i++) {
    + if (set(res->flags)) {
    pnp_printf(buffer, "mem");
    - if (pnp_mem_flags(dev, i) & IORESOURCE_DISABLED)
    + if (res->flags & IORESOURCE_DISABLED)
    pnp_printf(buffer, " disabled\n");
    else
    pnp_printf(buffer, " 0x%llx-0x%llx\n",
    - (unsigned long long)
    - pnp_mem_start(dev, i),
    - (unsigned long long)pnp_mem_end(dev,
    - i));
    + (unsigned long long) res->start,
    + (unsigned long long) res->end);
    }
    }
    - for (i = 0; i < PNP_MAX_IRQ; i++) {
    - if (pnp_irq_valid(dev, i)) {
    + for (i = 0; (res = pnp_get_resource(dev, IORESOURCE_IRQ, i)); i++) {
    + if (set(res->flags)) {
    pnp_printf(buffer, "irq");
    - if (pnp_irq_flags(dev, i) & IORESOURCE_DISABLED)
    + if (res->flags & IORESOURCE_DISABLED)
    pnp_printf(buffer, " disabled\n");
    else
    pnp_printf(buffer, " %lld\n",
    - (unsigned long long)pnp_irq(dev, i));
    + (unsigned long long) res->start);
    }
    }
    - for (i = 0; i < PNP_MAX_DMA; i++) {
    - if (pnp_dma_valid(dev, i)) {
    + for (i = 0; (res = pnp_get_resource(dev, IORESOURCE_DMA, i)); i++) {
    + if (set(res->flags)) {
    pnp_printf(buffer, "dma");
    - if (pnp_dma_flags(dev, i) & IORESOURCE_DISABLED)
    + if (res->flags & IORESOURCE_DISABLED)
    pnp_printf(buffer, " disabled\n");
    else
    pnp_printf(buffer, " %lld\n",
    - (unsigned long long)pnp_dma(dev, i));
    + (unsigned long long) res->start);
    }
    }
    ret = (buffer->curr - buf);
    Index: work8/drivers/pnp/quirks.c
    ===================================================================
    --- work8.orig/drivers/pnp/quirks.c 2008-04-10 16:21:52.000000000 -0600
    +++ work8/drivers/pnp/quirks.c 2008-04-10 16:22:08.000000000 -0600
    @@ -135,13 +135,15 @@

    pci_start = pci_resource_start(pdev, i);
    pci_end = pci_resource_end(pdev, i);
    - for (j = 0; j < PNP_MAX_MEM; j++) {
    - if (!pnp_mem_valid(dev, j) ||
    - pnp_mem_len(dev, j) == 0)
    + for (j = 0;
    + (res = pnp_get_resource(dev, IORESOURCE_MEM, j));
    + j++) {
    + if (res->flags & IORESOURCE_UNSET ||
    + (res->start == 0 && res->end == 0))
    continue;

    - pnp_start = pnp_mem_start(dev, j);
    - pnp_end = pnp_mem_end(dev, j);
    + pnp_start = res->start;
    + pnp_end = res->end;

    /*
    * If the PNP region doesn't overlap the PCI
    @@ -174,7 +176,6 @@
    pci_name(pdev), i,
    (unsigned long long) pci_start,
    (unsigned long long) pci_end);
    - res = pnp_get_resource(dev, IORESOURCE_MEM, j);
    res->flags = 0;
    }
    }
    Index: work8/drivers/pnp/resource.c
    ===================================================================
    --- work8.orig/drivers/pnp/resource.c 2008-04-10 16:21:52.000000000 -0600
    +++ work8/drivers/pnp/resource.c 2008-04-10 16:43:37.000000000 -0600
    @@ -245,9 +245,10 @@
    }

    /* check for internal conflicts */
    - for (i = 0; i < PNP_MAX_PORT && i != idx; i++) {
    - tres = pnp_get_resource(dev, IORESOURCE_IO, i);
    - if (tres && tres->flags & IORESOURCE_IO) {
    + for (i = 0;
    + i != idx && (tres = pnp_get_resource(dev, IORESOURCE_IO, i));
    + i++) {
    + if (tres->flags & IORESOURCE_IO) {
    tport = &tres->start;
    tend = &tres->end;
    if (ranged_conflict(port, end, tport, tend))
    @@ -259,9 +260,10 @@
    pnp_for_each_dev(tdev) {
    if (tdev == dev)
    continue;
    - for (i = 0; i < PNP_MAX_PORT; i++) {
    - tres = pnp_get_resource(tdev, IORESOURCE_IO, i);
    - if (tres && tres->flags & IORESOURCE_IO) {
    + for (i = 0;
    + (tres = pnp_get_resource(tdev, IORESOURCE_IO, i));
    + i++) {
    + if (tres->flags & IORESOURCE_IO) {
    if (cannot_compare(tres->flags))
    continue;
    tport = &tres->start;
    @@ -307,9 +309,10 @@
    }

    /* check for internal conflicts */
    - for (i = 0; i < PNP_MAX_MEM && i != idx; i++) {
    - tres = pnp_get_resource(dev, IORESOURCE_MEM, i);
    - if (tres && tres->flags & IORESOURCE_MEM) {
    + for (i = 0;
    + i != idx && (tres = pnp_get_resource(dev, IORESOURCE_MEM, i));
    + i++) {
    + if (tres->flags & IORESOURCE_MEM) {
    taddr = &tres->start;
    tend = &tres->end;
    if (ranged_conflict(addr, end, taddr, tend))
    @@ -321,9 +324,10 @@
    pnp_for_each_dev(tdev) {
    if (tdev == dev)
    continue;
    - for (i = 0; i < PNP_MAX_MEM; i++) {
    - tres = pnp_get_resource(tdev, IORESOURCE_MEM, i);
    - if (tres && tres->flags & IORESOURCE_MEM) {
    + for (i = 0;
    + (tres = pnp_get_resource(tdev, IORESOURCE_MEM, i));
    + i++) {
    + if (tres->flags & IORESOURCE_MEM) {
    if (cannot_compare(tres->flags))
    continue;
    taddr = &tres->start;
    @@ -368,9 +372,10 @@
    }

    /* check for internal conflicts */
    - for (i = 0; i < PNP_MAX_IRQ && i != idx; i++) {
    - tres = pnp_get_resource(dev, IORESOURCE_IRQ, i);
    - if (tres && tres->flags & IORESOURCE_IRQ) {
    + for (i = 0;
    + i != idx && (tres = pnp_get_resource(dev, IORESOURCE_IRQ, i));
    + i++) {
    + if (tres->flags & IORESOURCE_IRQ) {
    if (tres->start == *irq)
    return 0;
    }
    @@ -402,9 +407,10 @@
    pnp_for_each_dev(tdev) {
    if (tdev == dev)
    continue;
    - for (i = 0; i < PNP_MAX_IRQ; i++) {
    - tres = pnp_get_resource(tdev, IORESOURCE_IRQ, i);
    - if (tres && tres->flags & IORESOURCE_IRQ) {
    + for (i = 0;
    + (tres = pnp_get_resource(tdev, IORESOURCE_IRQ, i));
    + i++) {
    + if (tres->flags & IORESOURCE_IRQ) {
    if (cannot_compare(tres->flags))
    continue;
    if (tres->start == *irq)
    @@ -443,9 +449,10 @@
    }

    /* check for internal conflicts */
    - for (i = 0; i < PNP_MAX_DMA && i != idx; i++) {
    - tres = pnp_get_resource(dev, IORESOURCE_DMA, i);
    - if (tres && tres->flags & IORESOURCE_DMA) {
    + for (i = 0;
    + i != idx && (tres = pnp_get_resource(dev, IORESOURCE_DMA, i));
    + i++) {
    + if (tres->flags & IORESOURCE_DMA) {
    if (tres->start == *dma)
    return 0;
    }
    @@ -463,9 +470,10 @@
    pnp_for_each_dev(tdev) {
    if (tdev == dev)
    continue;
    - for (i = 0; i < PNP_MAX_DMA; i++) {
    - tres = pnp_get_resource(tdev, IORESOURCE_DMA, i);
    - if (tres && tres->flags & IORESOURCE_DMA) {
    + for (i = 0;
    + (tres = pnp_get_resource(tdev, IORESOURCE_DMA, i));
    + i++) {
    + if (tres->flags & IORESOURCE_DMA) {
    if (cannot_compare(tres->flags))
    continue;
    if (tres->start == *dma)
    Index: work8/drivers/pnp/system.c
    ===================================================================
    --- work8.orig/drivers/pnp/system.c 2008-04-10 16:21:52.000000000 -0600
    +++ work8/drivers/pnp/system.c 2008-04-10 16:22:08.000000000 -0600
    @@ -56,14 +56,15 @@

    static void reserve_resources_of_dev(struct pnp_dev *dev)
    {
    + struct resource *res;
    int i;

    - for (i = 0; i < PNP_MAX_PORT; i++) {
    - if (!pnp_port_valid(dev, i))
    + for (i = 0; (res = pnp_get_resource(dev, IORESOURCE_IO, i)); i++) {
    + if (res->flags & IORESOURCE_UNSET)
    continue;
    - if (pnp_port_start(dev, i) == 0)
    + if (res->start == 0)
    continue; /* disabled */
    - if (pnp_port_start(dev, i) < 0x100)
    + if (res->start < 0x100)
    /*
    * Below 0x100 is only standard PC hardware
    * (pics, kbd, timer, dma, ...)
    @@ -73,19 +74,17 @@
    * So, do nothing
    */
    continue;
    - if (pnp_port_end(dev, i) < pnp_port_start(dev, i))
    + if (res->end < res->start)
    continue; /* invalid */

    - reserve_range(dev, pnp_port_start(dev, i),
    - pnp_port_end(dev, i), 1);
    + reserve_range(dev, res->start, res->end, 1);
    }

    - for (i = 0; i < PNP_MAX_MEM; i++) {
    - if (!pnp_mem_valid(dev, i))
    + for (i = 0; (res = pnp_get_resource(dev, IORESOURCE_MEM, i)); i++) {
    + if (res->flags & IORESOURCE_UNSET)
    continue;

    - reserve_range(dev, pnp_mem_start(dev, i),
    - pnp_mem_end(dev, i), 0);
    + reserve_range(dev, res->start, res->end, 0);
    }
    }

    --


    \
     
     \ /
      Last update: 2008-04-18 23:09    [W:0.046 / U:0.540 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site