lkml.org 
[lkml]   [2012]   [Dec]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 04/15] PCI/acpiphp: Change acpiphp_glue_init() to return void instead of 0
    Date
    acpiphp_glue_init() always returns 0.  This patch changes the return
    type from an 'int' to 'void'.

    No functional change.

    Signed-off-by: Myron Stowe <myron.stowe@redhat.com>
    ---

    drivers/pci/hotplug/acpiphp.h | 2 +-
    drivers/pci/hotplug/acpiphp_core.c | 4 +++-
    drivers/pci/hotplug/acpiphp_glue.c | 4 +---
    3 files changed, 5 insertions(+), 5 deletions(-)

    diff --git a/drivers/pci/hotplug/acpiphp.h b/drivers/pci/hotplug/acpiphp.h
    index 4b798e9..ecd772c 100644
    --- a/drivers/pci/hotplug/acpiphp.h
    +++ b/drivers/pci/hotplug/acpiphp.h
    @@ -191,7 +191,7 @@ extern int acpiphp_register_hotplug_slot(struct acpiphp_slot *slot);
    extern void acpiphp_unregister_hotplug_slot(struct acpiphp_slot *slot);

    /* acpiphp_glue.c */
    -extern int acpiphp_glue_init(void);
    +extern void acpiphp_glue_init(void);
    extern void acpiphp_glue_exit(void);
    typedef int (*acpiphp_callback)(struct acpiphp_slot *slot, void *data);

    diff --git a/drivers/pci/hotplug/acpiphp_core.c b/drivers/pci/hotplug/acpiphp_core.c
    index 3350b09..011a538 100644
    --- a/drivers/pci/hotplug/acpiphp_core.c
    +++ b/drivers/pci/hotplug/acpiphp_core.c
    @@ -274,7 +274,9 @@ static int get_adapter_status(struct hotplug_slot *hotplug_slot, u8 *value)
    static int __init init_acpi(void)
    {
    /* initialize internal data structure etc. */
    - return acpiphp_glue_init();
    + acpiphp_glue_init();
    +
    + return 0;
    }

    /**
    diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
    index a378a48..50b58cb 100644
    --- a/drivers/pci/hotplug/acpiphp_glue.c
    +++ b/drivers/pci/hotplug/acpiphp_glue.c
    @@ -1415,11 +1415,9 @@ static struct acpi_pci_driver acpi_pci_hp_driver = {
    /**
    * acpiphp_glue_init - initializes all PCI hotplug - ACPI glue data structures
    */
    -int __init acpiphp_glue_init(void)
    +void __init acpiphp_glue_init(void)
    {
    acpi_pci_register_driver(&acpi_pci_hp_driver);
    -
    - return 0;
    }




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