lkml.org 
[lkml]   [2010]   [Aug]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 50/68] vt: Fix warning: statement with no effect due to vt_kern.h
    Date
    From: Kevin Winchester <kjwinchester@gmail.com>

    Using:

    gcc (GCC) 4.5.0 20100610 (prerelease)

    with CONFIG_CONSOLE_TRANSLATIONS=n, the following warnings are seen:

    drivers/char/vt_ioctl.c: In function ‘vt_ioctl’:
    drivers/char/vt_ioctl.c:1309:4: warning: statement with no effect
    drivers/char/vt.c: In function ‘vc_allocate’:
    drivers/char/vt.c:774:3: warning: statement with no effect
    drivers/video/console/vgacon.c: In function ‘vgacon_init’:
    drivers/video/console/vgacon.c:587:3: warning: statement with no effect
    drivers/video/console/vgacon.c: In function ‘vgacon_deinit’:
    drivers/video/console/vgacon.c:606:2: warning: statement with no effect
    drivers/video/console/fbcon.c: In function ‘fbcon_init’:
    drivers/video/console/fbcon.c:1087:3: warning: statement with no effect
    drivers/video/console/fbcon.c:1089:3: warning: statement with no effect
    drivers/video/console/fbcon.c: In function ‘fbcon_set_disp’:
    drivers/video/console/fbcon.c:1369:3: warning: statement with no effect
    drivers/video/console/fbcon.c:1371:3: warning: statement with no effect

    This is because several functions in include/linux/vt_kern.h are
    defined to (0). Convert them to static inline functions to
    silence the warnings and gain a bit of type safety.

    Signed-off-by: Kevin Winchester <kjwinchester@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    include/linux/vt_kern.h | 57 +++++++++++++++++++++++++++++++++++++---------
    1 files changed, 46 insertions(+), 11 deletions(-)

    diff --git a/include/linux/vt_kern.h b/include/linux/vt_kern.h
    index 56cce34..6625cc1 100644
    --- a/include/linux/vt_kern.h
    +++ b/include/linux/vt_kern.h
    @@ -76,17 +76,52 @@ int con_copy_unimap(struct vc_data *dst_vc, struct vc_data *src_vc);
    #define vc_translate(vc, c) ((vc)->vc_translate[(c) | \
    ((vc)->vc_toggle_meta ? 0x80 : 0)])
    #else
    -#define con_set_trans_old(arg) (0)
    -#define con_get_trans_old(arg) (-EINVAL)
    -#define con_set_trans_new(arg) (0)
    -#define con_get_trans_new(arg) (-EINVAL)
    -#define con_clear_unimap(vc, ui) (0)
    -#define con_set_unimap(vc, ct, list) (0)
    -#define con_set_default_unimap(vc) (0)
    -#define con_copy_unimap(d, s) (0)
    -#define con_get_unimap(vc, ct, uct, list) (-EINVAL)
    -#define con_free_unimap(vc) do { ; } while (0)
    -#define con_protect_unimap(vc, rdonly) do { ; } while (0)
    +static inline int con_set_trans_old(unsigned char __user *table)
    +{
    + return 0;
    +}
    +static inline int con_get_trans_old(unsigned char __user *table)
    +{
    + return -EINVAL;
    +}
    +static inline int con_set_trans_new(unsigned short __user *table)
    +{
    + return 0;
    +}
    +static inline int con_get_trans_new(unsigned short __user *table)
    +{
    + return -EINVAL;
    +}
    +static inline int con_clear_unimap(struct vc_data *vc, struct unimapinit *ui)
    +{
    + return 0;
    +}
    +static inline
    +int con_set_unimap(struct vc_data *vc, ushort ct, struct unipair __user *list)
    +{
    + return 0;
    +}
    +static inline
    +int con_get_unimap(struct vc_data *vc, ushort ct, ushort __user *uct,
    + struct unipair __user *list)
    +{
    + return -EINVAL;
    +}
    +static inline int con_set_default_unimap(struct vc_data *vc)
    +{
    + return 0;
    +}
    +static inline void con_free_unimap(struct vc_data *vc)
    +{
    +}
    +static inline void con_protect_unimap(struct vc_data *vc, int rdonly)
    +{
    +}
    +static inline
    +int con_copy_unimap(struct vc_data *dst_vc, struct vc_data *src_vc)
    +{
    + return 0;
    +}

    #define vc_translate(vc, c) (c)
    #endif
    --
    1.7.2
    --
    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: 2010-08-11 00:05    [W:0.028 / U:31.884 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site