lkml.org 
[lkml]   [2008]   [Apr]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 18/54] PNP: remove pnp_resource_table from internal get/set interfaces
    When we call protocol->get() and protocol->set() methods, we currently
    supply pointers to both the pnp_dev and the pnp_resource_table even
    though the pnp_resource_table should always be the one associated with
    the pnp_dev.

    This removes the pnp_resource_table arguments to make it clear that
    these methods only operate on the specified pnp_dev.

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

    ---
    include/linux/pnp.h | 4 ++--
    drivers/pnp/interface.c | 2 +-
    drivers/pnp/manager.c | 2 +-
    drivers/pnp/isapnp/core.c | 11 +++++------
    drivers/pnp/pnpacpi/core.c | 8 +++-----
    drivers/pnp/pnpbios/core.c | 10 ++++------
    6 files changed, 16 insertions(+), 21 deletions(-)

    Index: work10/include/linux/pnp.h
    ===================================================================
    --- work10.orig/include/linux/pnp.h 2008-04-25 11:14:55.000000000 -0600
    +++ work10/include/linux/pnp.h 2008-04-25 11:14:55.000000000 -0600
    @@ -328,8 +328,8 @@
    char *name;

    /* resource control functions */
    - int (*get) (struct pnp_dev *dev, struct pnp_resource_table *res);
    - int (*set) (struct pnp_dev *dev, struct pnp_resource_table *res);
    + int (*get) (struct pnp_dev *dev);
    + int (*set) (struct pnp_dev *dev);
    int (*disable) (struct pnp_dev *dev);

    /* protocol specific suspend/resume */
    Index: work10/drivers/pnp/interface.c
    ===================================================================
    --- work10.orig/drivers/pnp/interface.c 2008-04-25 11:12:16.000000000 -0600
    +++ work10/drivers/pnp/interface.c 2008-04-25 11:14:55.000000000 -0600
    @@ -364,7 +364,7 @@
    if (!strnicmp(buf, "get", 3)) {
    mutex_lock(&pnp_res_mutex);
    if (pnp_can_read(dev))
    - dev->protocol->get(dev, &dev->res);
    + dev->protocol->get(dev);
    mutex_unlock(&pnp_res_mutex);
    goto done;
    }
    Index: work10/drivers/pnp/manager.c
    ===================================================================
    --- work10.orig/drivers/pnp/manager.c 2008-04-25 11:12:16.000000000 -0600
    +++ work10/drivers/pnp/manager.c 2008-04-25 11:14:55.000000000 -0600
    @@ -473,7 +473,7 @@
    return -EINVAL;
    }

    - if (dev->protocol->set(dev, &dev->res) < 0) {
    + if (dev->protocol->set(dev) < 0) {
    dev_err(&dev->dev, "activation failed\n");
    return -EIO;
    }
    Index: work10/drivers/pnp/isapnp/core.c
    ===================================================================
    --- work10.orig/drivers/pnp/isapnp/core.c 2008-04-25 11:14:55.000000000 -0600
    +++ work10/drivers/pnp/isapnp/core.c 2008-04-25 11:14:55.000000000 -0600
    @@ -976,21 +976,20 @@
    return 0;
    }

    -static int isapnp_get_resources(struct pnp_dev *dev,
    - struct pnp_resource_table *res)
    +static int isapnp_get_resources(struct pnp_dev *dev)
    {
    int ret;

    - pnp_init_resource_table(res);
    + pnp_init_resource_table(&dev->res);
    isapnp_cfg_begin(dev->card->number, dev->number);
    - ret = isapnp_read_resources(dev, res);
    + ret = isapnp_read_resources(dev, &dev->res);
    isapnp_cfg_end();
    return ret;
    }

    -static int isapnp_set_resources(struct pnp_dev *dev,
    - struct pnp_resource_table *res)
    +static int isapnp_set_resources(struct pnp_dev *dev)
    {
    + struct pnp_resource_table *res = &dev->res;
    int tmp;

    isapnp_cfg_begin(dev->card->number, dev->number);
    Index: work10/drivers/pnp/pnpacpi/core.c
    ===================================================================
    --- work10.orig/drivers/pnp/pnpacpi/core.c 2008-04-25 11:14:54.000000000 -0600
    +++ work10/drivers/pnp/pnpacpi/core.c 2008-04-25 11:14:55.000000000 -0600
    @@ -73,8 +73,7 @@
    return 1;
    }

    -static int pnpacpi_get_resources(struct pnp_dev *dev,
    - struct pnp_resource_table *res)
    +static int pnpacpi_get_resources(struct pnp_dev *dev)
    {
    acpi_status status;

    @@ -83,8 +82,7 @@
    return ACPI_FAILURE(status) ? -ENODEV : 0;
    }

    -static int pnpacpi_set_resources(struct pnp_dev *dev,
    - struct pnp_resource_table *res)
    +static int pnpacpi_set_resources(struct pnp_dev *dev)
    {
    acpi_handle handle = dev->data;
    struct acpi_buffer buffer;
    @@ -94,7 +92,7 @@
    ret = pnpacpi_build_resource_template(dev, &buffer);
    if (ret)
    return ret;
    - ret = pnpacpi_encode_resources(res, &buffer);
    + ret = pnpacpi_encode_resources(&dev->res, &buffer);
    if (ret) {
    kfree(buffer.pointer);
    return ret;
    Index: work10/drivers/pnp/pnpbios/core.c
    ===================================================================
    --- work10.orig/drivers/pnp/pnpbios/core.c 2008-04-25 11:14:49.000000000 -0600
    +++ work10/drivers/pnp/pnpbios/core.c 2008-04-25 11:14:55.000000000 -0600
    @@ -204,8 +204,7 @@

    #endif /* CONFIG_HOTPLUG */

    -static int pnpbios_get_resources(struct pnp_dev *dev,
    - struct pnp_resource_table *res)
    +static int pnpbios_get_resources(struct pnp_dev *dev)
    {
    u8 nodenum = dev->number;
    struct pnp_bios_node *node;
    @@ -220,14 +219,13 @@
    kfree(node);
    return -ENODEV;
    }
    - pnpbios_read_resources_from_node(res, node);
    + pnpbios_read_resources_from_node(&dev->res, node);
    dev->active = pnp_is_active(dev);
    kfree(node);
    return 0;
    }

    -static int pnpbios_set_resources(struct pnp_dev *dev,
    - struct pnp_resource_table *res)
    +static int pnpbios_set_resources(struct pnp_dev *dev)
    {
    u8 nodenum = dev->number;
    struct pnp_bios_node *node;
    @@ -243,7 +241,7 @@
    kfree(node);
    return -ENODEV;
    }
    - if (pnpbios_write_resources_to_node(res, node) < 0) {
    + if (pnpbios_write_resources_to_node(&dev->res, node) < 0) {
    kfree(node);
    return -1;
    }
    --


    \
     
     \ /
      Last update: 2008-04-25 20:49    [W:4.072 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site