lkml.org 
[lkml]   [2004]   [Nov]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    SubjectRe: [PATCH] PCI fixes for 2.6.10-rc1
    Date
    From
    ChangeSet 1.2026.66.23, 2004/11/11 15:40:24-08:00, greg@kroah.com

    PCI Hotplug: fix up remaining MODULE_PARAM usage in pci hotplug drivers

    Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>


    drivers/pci/hotplug/cpcihp_generic.c | 14 +++++++-------
    drivers/pci/hotplug/fakephp.c | 2 +-
    drivers/pci/hotplug/ibmphp_core.c | 2 +-
    3 files changed, 9 insertions(+), 9 deletions(-)


    diff -Nru a/drivers/pci/hotplug/cpcihp_generic.c b/drivers/pci/hotplug/cpcihp_generic.c
    --- a/drivers/pci/hotplug/cpcihp_generic.c 2004-11-12 15:12:04 -08:00
    +++ b/drivers/pci/hotplug/cpcihp_generic.c 2004-11-12 15:12:04 -08:00
    @@ -63,7 +63,7 @@

    /* local variables */
    static int debug;
    -static char* bridge;
    +static char bridge[256];
    static u8 bridge_busnr;
    static u8 bridge_slot;
    static struct pci_bus *bus;
    @@ -209,15 +209,15 @@
    MODULE_AUTHOR(DRIVER_AUTHOR);
    MODULE_DESCRIPTION(DRIVER_DESC);
    MODULE_LICENSE("GPL");
    -MODULE_PARM(debug, "i");
    +module_param(debug, bool, S_IRUGO | S_IWUSR);
    MODULE_PARM_DESC(debug, "Debugging mode enabled or not");
    -MODULE_PARM(bridge, "s");
    +module_param_string(bridge, bridge, 256, 0);
    MODULE_PARM_DESC(bridge, "Hotswap bus bridge device, <bus>:<slot> (bus and slot are in hexadecimal)");
    -MODULE_PARM(first_slot, "b");
    +module_param(first_slot, byte, 0);
    MODULE_PARM_DESC(first_slot, "Hotswap bus first slot number");
    -MODULE_PARM(last_slot, "b");
    +module_param(last_slot, byte, 0);
    MODULE_PARM_DESC(last_slot, "Hotswap bus last slot number");
    -MODULE_PARM(port, "h");
    +module_param(port, ushort, 0);
    MODULE_PARM_DESC(port, "#ENUM signal I/O port");
    -MODULE_PARM(enum_bit, "i");
    +module_param(enum_bit, int, 0);
    MODULE_PARM_DESC(enum_bit, "#ENUM signal bit (0-7)");
    diff -Nru a/drivers/pci/hotplug/fakephp.c b/drivers/pci/hotplug/fakephp.c
    --- a/drivers/pci/hotplug/fakephp.c 2004-11-12 15:12:04 -08:00
    +++ b/drivers/pci/hotplug/fakephp.c 2004-11-12 15:12:04 -08:00
    @@ -227,6 +227,6 @@
    MODULE_AUTHOR(DRIVER_AUTHOR);
    MODULE_DESCRIPTION(DRIVER_DESC);
    MODULE_LICENSE("GPL");
    -MODULE_PARM(debug, "i");
    +module_param(debug, bool, S_IRUGO | S_IWUSR);
    MODULE_PARM_DESC(debug, "Debugging mode enabled or not");

    diff -Nru a/drivers/pci/hotplug/ibmphp_core.c b/drivers/pci/hotplug/ibmphp_core.c
    --- a/drivers/pci/hotplug/ibmphp_core.c 2004-11-12 15:12:04 -08:00
    +++ b/drivers/pci/hotplug/ibmphp_core.c 2004-11-12 15:12:04 -08:00
    @@ -51,7 +51,7 @@
    int ibmphp_debug;

    static int debug;
    -MODULE_PARM (debug, "i");
    +module_param(debug, bool, S_IRUGO | S_IWUSR);
    MODULE_PARM_DESC (debug, "Debugging mode enabled or not");
    MODULE_LICENSE ("GPL");
    MODULE_DESCRIPTION (DRIVER_DESC);
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2005-03-22 14:08    [W:0.025 / U:0.732 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site