lkml.org 
[lkml]   [2008]   [Mar]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 1/5] cdrom: remove ifdef CONFIG_SYSCTL
    This patch removes #ifdef for CONFIG_SYSCTL by defining empty
    cdrom_sysctl_register and cdrom_sysctl_unregister when CONFIG_SYSCTL
    is not defined.

    Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
    Cc: Jens Axboe <axboe@kernel.dk>
    ---
    drivers/cdrom/cdrom.c | 20 ++++++++++++--------
    1 file changed, 12 insertions(+), 8 deletions(-)

    Index: 2.6-git/drivers/cdrom/cdrom.c
    ===================================================================
    --- 2.6-git.orig/drivers/cdrom/cdrom.c
    +++ 2.6-git/drivers/cdrom/cdrom.c
    @@ -360,9 +360,8 @@ static int cdrom_mrw_exit(struct cdrom_d

    static int cdrom_get_disc_info(struct cdrom_device_info *cdi, disc_information *di);

    -#ifdef CONFIG_SYSCTL
    static void cdrom_sysctl_register(void);
    -#endif /* CONFIG_SYSCTL */
    +
    static struct cdrom_device_info *topCdromPtr;

    static int cdrom_dummy_generic_packet(struct cdrom_device_info *cdi,
    @@ -398,9 +397,7 @@ int register_cdrom(struct cdrom_device_i
    if (!banner_printed) {
    printk(KERN_INFO "Uniform CD-ROM driver " REVISION "\n");
    banner_printed = 1;
    -#ifdef CONFIG_SYSCTL
    cdrom_sysctl_register();
    -#endif /* CONFIG_SYSCTL */
    }

    ENSURE(drive_status, CDC_DRIVE_STATUS );
    @@ -3571,22 +3568,29 @@ static void cdrom_sysctl_unregister(void
    unregister_sysctl_table(cdrom_sysctl_header);
    }

    +#else /* CONFIG_SYSCTL */
    +
    +static void cdrom_sysctl_register(void)
    +{
    +}
    +
    +static void cdrom_sysctl_unregister(void)
    +{
    +}
    +
    #endif /* CONFIG_SYSCTL */

    static int __init cdrom_init(void)
    {
    -#ifdef CONFIG_SYSCTL
    cdrom_sysctl_register();
    -#endif
    +
    return 0;
    }

    static void __exit cdrom_exit(void)
    {
    printk(KERN_INFO "Uniform CD-ROM driver unloaded\n");
    -#ifdef CONFIG_SYSCTL
    cdrom_sysctl_unregister();
    -#endif
    }

    module_init(cdrom_init);

    \
     
     \ /
      Last update: 2008-03-22 04:21    [W:0.023 / U:36.152 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site