lkml.org 
[lkml]   [2012]   [Nov]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 8/9] isdn: Make CONFIG_ISDN depend on CONFIG_NETDEVICES
    Does something like look like a better solution?

    Author: Lee Jones <lee.jones@linaro.org>
    Date: Sat Nov 3 22:06:02 2012 +0100

    isdn: Make CONFIG_ISDN depend on CONFIG_NETDEVICES

    It doesn't make much sense to enable ISDN services if you don't
    intend to connect to a network. Therefore insisting that ISDN
    depends on NETDEVICES seems logical. We can then remove any
    guards mentioning NETDEVICES inside all subordinate drivers.

    This also has the nice side-effect of fixing the warning below
    when ISDN_I4L && !CONFIG_NETDEVICES at compile time.

    This patch fixes:
    drivers/isdn/i4l/isdn_common.c: In function ‘isdn_ioctl’:
    drivers/isdn/i4l/isdn_common.c:1278:8: warning: unused variable ‘s’ [-Wunused-variable]

    Cc: Karsten Keil <isdn@linux-pingi.de>
    Cc: netdev@vger.kernel.org
    Signed-off-by: Lee Jones <lee.jones@linaro.org>

    diff --git a/drivers/isdn/Kconfig b/drivers/isdn/Kconfig
    index a233ed5..86cd75a 100644
    --- a/drivers/isdn/Kconfig
    +++ b/drivers/isdn/Kconfig
    @@ -4,7 +4,7 @@

    menuconfig ISDN
    bool "ISDN support"
    - depends on NET
    + depends on NET && NETDEVICES
    depends on !S390 && !UML
    ---help---
    ISDN ("Integrated Services Digital Network", called RNIS in France)
    diff --git a/drivers/isdn/i4l/Kconfig b/drivers/isdn/i4l/Kconfig
    index 2302fbe..9c6650e 100644
    --- a/drivers/isdn/i4l/Kconfig
    +++ b/drivers/isdn/i4l/Kconfig
    @@ -6,7 +6,7 @@ if ISDN_I4L

    config ISDN_PPP
    bool "Support synchronous PPP"
    - depends on INET && NETDEVICES
    + depends on INET
    select SLHC
    help
    Over digital connections such as ISDN, there is no need to
    diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
    index 8c610fa..e2a945e 100644
    --- a/drivers/isdn/i4l/isdn_common.c
    +++ b/drivers/isdn/i4l/isdn_common.c
    @@ -1312,7 +1312,6 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg)
    } else
    return -EINVAL;
    break;
    -#ifdef CONFIG_NETDEVICES
    case IIOCNETGPN:
    /* Get peer phone number of a connected
    * isdn network interface */
    @@ -1322,7 +1321,6 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg)
    return isdn_net_getpeer(&phone, argp);
    } else
    return -EINVAL;
    -#endif
    default:
    return -EINVAL;
    }
    @@ -1352,7 +1350,6 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg)
    case IIOCNETLCR:
    printk(KERN_INFO "INFO: ISDN_ABC_LCR_SUPPORT not enabled\n");
    return -ENODEV;
    -#ifdef CONFIG_NETDEVICES
    case IIOCNETAIF:
    /* Add a network-interface */
    if (arg) {
    @@ -1491,7 +1488,6 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg)
    return -EFAULT;
    return isdn_net_force_hangup(name);
    break;
    -#endif /* CONFIG_NETDEVICES */
    case IIOCSETVER:
    dev->net_verbose = arg;
    printk(KERN_INFO "isdn: Verbose-Level is %d\n", dev->net_verbose);
    --
    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: 2012-11-05 12:02    [W:3.143 / U:0.172 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site