lkml.org 
[lkml]   [2020]   [Apr]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 107/146] rtc: omap: Use define directive for PIN_CONFIG_ACTIVE_HIGH
    Date
    From: Nathan Chancellor <natechancellor@gmail.com>

    commit c50156526a2f7176b50134e3e5fb108ba09791b2 upstream.

    Clang warns when one enumerated type is implicitly converted to another:

    drivers/rtc/rtc-omap.c:574:21: warning: implicit conversion from
    enumeration type 'enum rtc_pin_config_param' to different enumeration
    type 'enum pin_config_param' [-Wenum-conversion]
    {"ti,active-high", PIN_CONFIG_ACTIVE_HIGH, 0},
    ~ ^~~~~~~~~~~~~~~~~~~~~~
    drivers/rtc/rtc-omap.c:579:12: warning: implicit conversion from
    enumeration type 'enum rtc_pin_config_param' to different enumeration
    type 'enum pin_config_param' [-Wenum-conversion]
    PCONFDUMP(PIN_CONFIG_ACTIVE_HIGH, "input active high", NULL, false),
    ~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    ./include/linux/pinctrl/pinconf-generic.h:163:11: note: expanded from
    macro 'PCONFDUMP'
    .param = a, .display = b, .format = c, .has_arg = d \
    ^
    2 warnings generated.

    It is expected that pinctrl drivers can extend pin_config_param because
    of the gap between PIN_CONFIG_END and PIN_CONFIG_MAX so this conversion
    isn't an issue. Most drivers that take advantage of this define the
    PIN_CONFIG variables as constants, rather than enumerated values. Do the
    same thing here so that Clang no longer warns.

    Link: https://github.com/ClangBuiltLinux/linux/issues/144
    Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
    Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/rtc/rtc-omap.c | 4 +---
    1 file changed, 1 insertion(+), 3 deletions(-)

    --- a/drivers/rtc/rtc-omap.c
    +++ b/drivers/rtc/rtc-omap.c
    @@ -561,9 +561,7 @@ static const struct pinctrl_ops rtc_pinc
    .dt_free_map = pinconf_generic_dt_free_map,
    };

    -enum rtc_pin_config_param {
    - PIN_CONFIG_ACTIVE_HIGH = PIN_CONFIG_END + 1,
    -};
    +#define PIN_CONFIG_ACTIVE_HIGH (PIN_CONFIG_END + 1)

    static const struct pinconf_generic_params rtc_params[] = {
    {"ti,active-high", PIN_CONFIG_ACTIVE_HIGH, 0},

    \
     
     \ /
      Last update: 2020-04-16 17:56    [W:4.122 / U:0.512 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site