lkml.org 
[lkml]   [2011]   [Apr]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    SubjectRe: linux-next: Tree for April 4 [BROKEN thinkpad_acpi]
    From
    On Mon, Apr 4, 2011 at 3:00 PM, Matthew Garrett <mjg@redhat.com> wrote:
    > On Mon, Apr 04, 2011 at 05:49:29AM -0700, Joe Perches wrote:
    >
    >> It's vdbg_printk no_printk verification.
    >>
    >> #ifdef CONFIG_THINKPAD_ACPI_DEBUG
    >> #define vdbg_printk dbg_printk
    >> static const char *str_supported(int is_supported);
    >> #else
    >> #define vdbg_printk(a_dbg_level, format, arg...)      \
    >>       no_printk(format, ##arg)
    >> #endif
    >>
    >> Two ways to handle this.
    >>
    >> 1: add
    >> static inline const char *str_supported(int is_supported) { return ""; }
    >> to the #else
    >>
    >> 2: Remove no_printk verification and return it to do {} while (0)
    >>
    >> Do you have a preference?
    >
    > I don't. Henrique?
    >
    > --
    > Matthew Garrett | mjg59@srcf.ucam.org
    >

    I have tried with solution #2 as it partially restores old behaviour
    (patch is attached).

    - Sedat -
    diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
    index d8f3e65..983e42f 100644
    --- a/drivers/platform/x86/thinkpad_acpi.c
    +++ b/drivers/platform/x86/thinkpad_acpi.c
    @@ -391,7 +391,7 @@ do { \
    static const char *str_supported(int is_supported);
    #else
    #define vdbg_printk(a_dbg_level, format, arg...) \
    - no_printk(format, ##arg)
    + do { } while (0)
    #endif

    static void tpacpi_log_usertask(const char * const what)
    \
     
     \ /
      Last update: 2011-04-04 15:47    [W:0.022 / U:1.396 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site