lkml.org 
[lkml]   [2008]   [Mar]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: [PATCH 3/4] Introduce pci_slot
    Hi Andrew,

    * Andrew Morton <akpm@linux-foundation.org>:
    > On Mon, 24 Mar 2008 22:17:00 -0600 Alex Chiang <achiang@hp.com> wrote:
    >
    > > Currently, /sys/bus/pci/slots/ only exposes hotplug attributes
    > > when a hotplug driver is loaded, but PCI slots have attributes
    > > such as address, speed, width, etc. that are not related to
    > > hotplug at all.
    > >
    > > Introduce pci_slot as the primary data structure and kobject
    > > model. Hotplug attributes described in hotplug_slot become a
    > > secondary structure associated with the pci_slot.
    > >
    > > This patch only creates the infrastructure that allows the
    > > separation of PCI slot attributes and hotplug attributes.
    > > In this patch, the PCI hotplug core remains the only user of this
    > > infrastructure, and thus, /sys/bus/pci/slots/ will still only
    > > become populated when a hotplug driver is loaded.
    > >
    >
    > I've so far fixed four compile errors in this patch. It's your turn:

    Sorry for the sloppiness. :(

    In the future, do you have a better suggestion on how to do large
    sweeps on code for hardware that one might not own? Is there an
    easier way other than setting up a cross-compiler environment?

    Thanks.

    /ac

    Subject: [PATCH] remove rpaphp 'address_read_file'
    From: Alex Chiang <achiang@hp.com>

    Physical pci_slot removed ->get_address methods from individual
    PCI hotplug drivers, but overlooked rpaphp, causing build errors.

    Remove rpaphp's 'address_read_file' as well.

    Signed-off-by: Alex Chiang <achiang@hp.com>
    ---
    drivers/pci/hotplug/rpaphp_slot.c | 37 -------------------------------------
    1 files changed, 0 insertions(+), 37 deletions(-)

    diff --git a/drivers/pci/hotplug/rpaphp_slot.c b/drivers/pci/hotplug/rpaphp_slot.c
    index 8e5fff0..0d4cfc7 100644
    --- a/drivers/pci/hotplug/rpaphp_slot.c
    +++ b/drivers/pci/hotplug/rpaphp_slot.c
    @@ -33,33 +33,6 @@
    #include <asm/rtas.h>
    #include "rpaphp.h"

    -static ssize_t address_read_file (struct hotplug_slot *php_slot, char *buf)
    -{
    - int retval;
    - struct slot *slot = (struct slot *)php_slot->private;
    - struct pci_bus *bus;
    -
    - if (!slot)
    - return -ENOENT;
    -
    - bus = slot->bus;
    - if (!bus)
    - return -ENOENT;
    -
    - if (bus->self)
    - retval = sprintf(buf, pci_name(bus->self));
    - else
    - retval = sprintf(buf, "%04x:%02x:00.0",
    - pci_domain_nr(bus), bus->number);
    -
    - return retval;
    -}
    -
    -static struct hotplug_slot_attribute php_attr_address = {
    - .attr = {.name = "address", .mode = S_IFREG | S_IRUGO},
    - .show = address_read_file,
    -};
    -
    /* free up the memory used by a slot */
    static void rpaphp_release_slot(struct hotplug_slot *hotplug_slot)
    {
    @@ -135,9 +108,6 @@ int rpaphp_deregister_slot(struct slot *slot)

    list_del(&slot->rpaphp_slot_list);

    - /* remove "address" file */
    - sysfs_remove_file(&php_slot->kobj, &php_attr_address.attr);
    -
    retval = pci_hp_deregister(php_slot);
    if (retval)
    err("Problem unregistering a slot %s\n", slot->name);
    @@ -169,13 +139,6 @@ int rpaphp_register_slot(struct slot *slot)
    return retval;
    }

    - /* create "address" file */
    - retval = sysfs_create_file(&php_slot->kobj, &php_attr_address.attr);
    - if (retval) {
    - err("sysfs_create_file failed with error %d\n", retval);
    - goto sysfs_fail;
    - }
    -
    /* add slot to our internal list */
    list_add(&slot->rpaphp_slot_list, &rpaphp_slot_head);
    info("Slot [%s] registered\n", slot->name);
    --
    1.5.3.1.g1e61


    \
     
     \ /
      Last update: 2008-03-28 16:45    [W:0.026 / U:118.752 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site