Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1589777 > unrolled thread

[PATCH 3/8] watchdog: wm831x watchdog really needs mfd

Started byArnd Bergmann <arnd@arndb.de>
First post2017-02-28 22:10 +0100
Last post2017-03-01 04:20 +0100
Articles 6 — 3 participants

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.


Contents

  [PATCH 3/8] watchdog: wm831x watchdog really needs mfd Arnd Bergmann <arnd@arndb.de> - 2017-02-28 22:10 +0100
    Re: [PATCH 3/8] watchdog: wm831x watchdog really needs mfd Guenter Roeck <linux@roeck-us.net> - 2017-02-28 22:40 +0100
      Re: [PATCH 3/8] watchdog: wm831x watchdog really needs mfd Arnd Bergmann <arnd@arndb.de> - 2017-02-28 23:00 +0100
        Re: [PATCH 3/8] watchdog: wm831x watchdog really needs mfd Arnd Bergmann <arnd@arndb.de> - 2017-02-28 23:20 +0100
          Re: [PATCH 3/8] watchdog: wm831x watchdog really needs mfd Guenter Roeck <linux@roeck-us.net> - 2017-03-01 02:10 +0100
            Re: [PATCH 3/8] watchdog: wm831x watchdog really needs mfd Randy Dunlap <rdunlap@infradead.org> - 2017-03-01 04:20 +0100

#1589777 — [PATCH 3/8] watchdog: wm831x watchdog really needs mfd

FromArnd Bergmann <arnd@arndb.de>
Date2017-02-28 22:10 +0100
Subject[PATCH 3/8] watchdog: wm831x watchdog really needs mfd
Message-ID<tfXbY-1nX-25@gated-at.bofh.it>
The wm831x watchdog driver can now be built without the wm831x mfd
driver, which results in a link error:

(.text+0x1a95c): undefined reference to `wm831x_set_bits'
(.text+0x1a95c): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `wm831x_set_bits'
(.text+0x1a968): undefined reference to `wm831x_reg_lock'
(.text+0x1a968): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `wm831x_reg_lock'
(.text+0x1a9dc): undefined reference to `wm831x_reg_unlock'
(.text+0x1a9dc): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `wm831x_reg_unlock'

This adds back the dependency that was removed. We can still build test
this driver on all architectures by enabling the MFD driver for it first.

Fixes: da2a68b3eb47 ("watchdog: Enable COMPILE_TEST where possible")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/watchdog/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 6ca2f3ae7f1e..34a927703d64 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -176,7 +176,7 @@ config WDAT_WDT
 
 config WM831X_WATCHDOG
 	tristate "WM831x watchdog"
-	depends on MFD_WM831X || COMPILE_TEST
+	depends on MFD_WM831X
 	select WATCHDOG_CORE
 	help
 	  Support for the watchdog in the WM831x AudioPlus PMICs.  When
-- 
2.9.0

[toc] | [next] | [standalone]


#1589813

FromGuenter Roeck <linux@roeck-us.net>
Date2017-02-28 22:40 +0100
Message-ID<tfXF0-1ys-11@gated-at.bofh.it>
In reply to#1589777
On Tue, Feb 28, 2017 at 10:01:18PM +0100, Arnd Bergmann wrote:
> The wm831x watchdog driver can now be built without the wm831x mfd
> driver, which results in a link error:
> 
> (.text+0x1a95c): undefined reference to `wm831x_set_bits'
> (.text+0x1a95c): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `wm831x_set_bits'
> (.text+0x1a968): undefined reference to `wm831x_reg_lock'
> (.text+0x1a968): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `wm831x_reg_lock'
> (.text+0x1a9dc): undefined reference to `wm831x_reg_unlock'
> (.text+0x1a9dc): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `wm831x_reg_unlock'
> 
> This adds back the dependency that was removed. We can still build test
> this driver on all architectures by enabling the MFD driver for it first.
> 
> Fixes: da2a68b3eb47 ("watchdog: Enable COMPILE_TEST where possible")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
>  drivers/watchdog/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> index 6ca2f3ae7f1e..34a927703d64 100644
> --- a/drivers/watchdog/Kconfig
> +++ b/drivers/watchdog/Kconfig
> @@ -176,7 +176,7 @@ config WDAT_WDT
>  
>  config WM831X_WATCHDOG
>  	tristate "WM831x watchdog"
> -	depends on MFD_WM831X || COMPILE_TEST
> +	depends on MFD_WM831X

I prefer the fix proposed by Randy:

-       depends on MFD_WM831X || COMPILE_TEST
+       depends on MFD_WM831X || (MFD_WM831X=y && COMPILE_TEST)

>  	select WATCHDOG_CORE
>  	help
>  	  Support for the watchdog in the WM831x AudioPlus PMICs.  When
> -- 
> 2.9.0
> 

[toc] | [prev] | [next] | [standalone]


#1589830

FromArnd Bergmann <arnd@arndb.de>
Date2017-02-28 23:00 +0100
Message-ID<tfXYl-1Fm-7@gated-at.bofh.it>
In reply to#1589813
On Tue, Feb 28, 2017 at 10:36 PM, Guenter Roeck <linux@roeck-us.net> wrote:

>>  config WM831X_WATCHDOG
>>       tristate "WM831x watchdog"
>> -     depends on MFD_WM831X || COMPILE_TEST
>> +     depends on MFD_WM831X
>
> I prefer the fix proposed by Randy:
>
> -       depends on MFD_WM831X || COMPILE_TEST
> +       depends on MFD_WM831X || (MFD_WM831X=y && COMPILE_TEST)
>

Agreed, that's better.

    Arnd

[toc] | [prev] | [next] | [standalone]


#1589833

FromArnd Bergmann <arnd@arndb.de>
Date2017-02-28 23:20 +0100
Message-ID<tfYhH-21y-1@gated-at.bofh.it>
In reply to#1589830
On Tue, Feb 28, 2017 at 10:44 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> On Tue, Feb 28, 2017 at 10:36 PM, Guenter Roeck <linux@roeck-us.net> wrote:
>
>>>  config WM831X_WATCHDOG
>>>       tristate "WM831x watchdog"
>>> -     depends on MFD_WM831X || COMPILE_TEST
>>> +     depends on MFD_WM831X
>>
>> I prefer the fix proposed by Randy:
>>
>> -       depends on MFD_WM831X || COMPILE_TEST
>> +       depends on MFD_WM831X || (MFD_WM831X=y && COMPILE_TEST)
>>
>
> Agreed, that's better.

Actually I misread. They should be completely equivalent, the part after
the || has no effect here.

     Arnd

[toc] | [prev] | [next] | [standalone]


#1589921

FromGuenter Roeck <linux@roeck-us.net>
Date2017-03-01 02:10 +0100
Message-ID<tg0Wd-3Nm-11@gated-at.bofh.it>
In reply to#1589833
On Tue, Feb 28, 2017 at 10:48:27PM +0100, Arnd Bergmann wrote:
> On Tue, Feb 28, 2017 at 10:44 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> > On Tue, Feb 28, 2017 at 10:36 PM, Guenter Roeck <linux@roeck-us.net> wrote:
> >
> >>>  config WM831X_WATCHDOG
> >>>       tristate "WM831x watchdog"
> >>> -     depends on MFD_WM831X || COMPILE_TEST
> >>> +     depends on MFD_WM831X
> >>
> >> I prefer the fix proposed by Randy:
> >>
> >> -       depends on MFD_WM831X || COMPILE_TEST
> >> +       depends on MFD_WM831X || (MFD_WM831X=y && COMPILE_TEST)
> >>
> >
> > Agreed, that's better.
> 
> Actually I misread. They should be completely equivalent, the part after
> the || has no effect here.
> 
Yes, I figured that out later as well.

Guenter

[toc] | [prev] | [next] | [standalone]


#1589962

FromRandy Dunlap <rdunlap@infradead.org>
Date2017-03-01 04:20 +0100
Message-ID<tg2Y2-5e0-7@gated-at.bofh.it>
In reply to#1589921
On 02/28/17 15:16, Guenter Roeck wrote:
> On Tue, Feb 28, 2017 at 10:48:27PM +0100, Arnd Bergmann wrote:
>> On Tue, Feb 28, 2017 at 10:44 PM, Arnd Bergmann <arnd@arndb.de> wrote:
>>> On Tue, Feb 28, 2017 at 10:36 PM, Guenter Roeck <linux@roeck-us.net> wrote:
>>>
>>>>>  config WM831X_WATCHDOG
>>>>>       tristate "WM831x watchdog"
>>>>> -     depends on MFD_WM831X || COMPILE_TEST
>>>>> +     depends on MFD_WM831X
>>>>
>>>> I prefer the fix proposed by Randy:
>>>>
>>>> -       depends on MFD_WM831X || COMPILE_TEST
>>>> +       depends on MFD_WM831X || (MFD_WM831X=y && COMPILE_TEST)
>>>>
>>>
>>> Agreed, that's better.
>>
>> Actually I misread. They should be completely equivalent, the part after
>> the || has no effect here.
>>
> Yes, I figured that out later as well.

Agreed.  Arnd's is simpler.  My patch might keep someone else from
making the same mistake.  ;)


-- 
~Randy

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web