lkml.org 
[lkml]   [2005]   [Mar]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[patch 14/15] drivers/block/*: convert to pci_register_driver
    From
    Date

    convert from pci_module_init to pci_register_driver

    Signed-off-by: Christophe Lucas <c.lucas@ifrance.com>
    Signed-off-by: Domen Puncer <domen@coderock.org>
    ---


    kj-domen/drivers/block/DAC960.c | 2 +-
    kj-domen/drivers/block/cciss.c | 2 +-
    kj-domen/drivers/block/sx8.c | 2 +-
    kj-domen/drivers/block/umem.c | 2 +-
    4 files changed, 4 insertions(+), 4 deletions(-)

    diff -puN drivers/block/DAC960.c~pci_register_driver-drivers_block drivers/block/DAC960.c
    --- kj/drivers/block/DAC960.c~pci_register_driver-drivers_block 2005-03-05 16:12:15.000000000 +0100
    +++ kj-domen/drivers/block/DAC960.c 2005-03-05 16:12:16.000000000 +0100
    @@ -7067,7 +7067,7 @@ static int DAC960_init_module(void)
    {
    int ret;

    - ret = pci_module_init(&DAC960_pci_driver);
    + ret = pci_register_driver(&DAC960_pci_driver);
    #ifdef DAC960_GAM_MINOR
    if (!ret)
    DAC960_gam_init();
    diff -puN drivers/block/cciss.c~pci_register_driver-drivers_block drivers/block/cciss.c
    --- kj/drivers/block/cciss.c~pci_register_driver-drivers_block 2005-03-05 16:12:15.000000000 +0100
    +++ kj-domen/drivers/block/cciss.c 2005-03-05 16:12:16.000000000 +0100
    @@ -2880,7 +2880,7 @@ int __init cciss_init(void)
    printk(KERN_INFO DRIVER_NAME "\n");

    /* Register for our PCI devices */
    - return pci_module_init(&cciss_pci_driver);
    + return pci_register_driver(&cciss_pci_driver);
    }

    static int __init init_cciss_module(void)
    diff -puN drivers/block/sx8.c~pci_register_driver-drivers_block drivers/block/sx8.c
    --- kj/drivers/block/sx8.c~pci_register_driver-drivers_block 2005-03-05 16:12:15.000000000 +0100
    +++ kj-domen/drivers/block/sx8.c 2005-03-05 16:12:16.000000000 +0100
    @@ -1750,7 +1750,7 @@ static void carm_remove_one (struct pci_

    static int __init carm_init(void)
    {
    - return pci_module_init(&carm_driver);
    + return pci_register_driver(&carm_driver);
    }

    static void __exit carm_exit(void)
    diff -puN drivers/block/umem.c~pci_register_driver-drivers_block drivers/block/umem.c
    --- kj/drivers/block/umem.c~pci_register_driver-drivers_block 2005-03-05 16:12:16.000000000 +0100
    +++ kj-domen/drivers/block/umem.c 2005-03-05 16:12:16.000000000 +0100
    @@ -1185,7 +1185,7 @@ int __init mm_init(void)

    printk(KERN_INFO DRIVER_VERSION " : " DRIVER_DESC "\n");

    - retval = pci_module_init(&mm_pci_driver);
    + retval = pci_register_driver(&mm_pci_driver);
    if (retval)
    return -ENOMEM;

    _
    -
    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:10    [W:0.021 / U:90.104 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site