lkml.org 
[lkml]   [2013]   [Jul]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFC][PATCH 14/30] ACPI / hotplug / PCI: Drop flags field from struct acpiphp_bridge
    Date
    From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

    The only bridge flag used by the ACPI-based PCI hotplug (ACPIPHP)
    code is BRIDGE_HAS_EJ0, but it is only used by the event handling
    function hotplug_event() and if that flag is set, the corresponding
    function flag FUNC_HAS_EJ0 is set as well, so that bridge flag is
    redundant.

    For this reason, drop BRIDGE_HAS_EJ0 and all code referring to it
    and since it is the only bridge flag defined, drop the flags field
    from struct acpiphp_bridge entirely.

    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
    ---
    drivers/pci/hotplug/acpiphp.h | 5 -----
    drivers/pci/hotplug/acpiphp_glue.c | 9 ---------
    2 files changed, 14 deletions(-)

    Index: linux-pm/drivers/pci/hotplug/acpiphp.h
    ===================================================================
    --- linux-pm.orig/drivers/pci/hotplug/acpiphp.h
    +++ linux-pm/drivers/pci/hotplug/acpiphp.h
    @@ -80,8 +80,6 @@ struct acpiphp_bridge {

    struct acpiphp_context *context;

    - u32 flags;
    -
    /* This bus (host bridge) or Secondary bus (PCI-to-PCI bridge) */
    struct pci_bus *pci_bus;

    @@ -152,9 +150,6 @@ struct acpiphp_attention_info
    /* ACPI _STA method value (ignore bit 4; battery present) */
    #define ACPI_STA_ALL (0x0000000f)

    -/* bridge flags */
    -#define BRIDGE_HAS_EJ0 (0x00000001)
    -
    /* slot flags */

    #define SLOT_POWEREDON (0x00000001)
    Index: linux-pm/drivers/pci/hotplug/acpiphp_glue.c
    ===================================================================
    --- linux-pm.orig/drivers/pci/hotplug/acpiphp_glue.c
    +++ linux-pm/drivers/pci/hotplug/acpiphp_glue.c
    @@ -1009,9 +1009,6 @@ static void hotplug_event(acpi_handle ha
    case ACPI_NOTIFY_EJECT_REQUEST:
    /* request device eject */
    dbg("%s: Device eject notify on %s\n", __func__, objname);
    - if (bridge && !(bridge->flags & BRIDGE_HAS_EJ0))
    - break;
    -
    if (!(acpiphp_disable_slot(func->slot)))
    acpiphp_eject_slot(func->slot);

    @@ -1148,12 +1145,6 @@ void acpiphp_enumerate_slots(struct pci_
    mutex_unlock(&acpiphp_context_lock);
    }

    - status = acpi_get_handle(bridge->handle, "_EJ0", &handle);
    - if (ACPI_SUCCESS(status)) {
    - dbg("found ejectable p2p bridge\n");
    - bridge->flags |= BRIDGE_HAS_EJ0;
    - }
    -
    /* must be added to the list prior to calling register_slot */
    mutex_lock(&bridge_mutex);
    list_add(&bridge->list, &bridge_list);


    \
     
     \ /
      Last update: 2013-07-12 02:41    [W:4.093 / U:0.212 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site