* [PATCH] watchdog: mtx-1: drop au1000.h header file
@ 2021-05-16 21:17 Randy Dunlap
2021-05-16 23:08 ` Guenter Roeck
2021-05-16 23:54 ` Florian Fainelli
0 siblings, 2 replies; 5+ messages in thread
From: Randy Dunlap @ 2021-05-16 21:17 UTC (permalink / raw)
To: linux-kernel
Cc: Randy Dunlap, Wim Van Sebroeck, Guenter Roeck, linux-watchdog,
Florian Fainelli
The mtx-1_wdt driver does not need the au1000.h header file.
Instead, the header file causes build errors, so drop it.
This change fixes multiple build errors, all in au1000.h. E.g.:
In file included from ../drivers/watchdog/mtx-1_wdt.c:44:
../arch/mips/include/asm/mach-au1x00/au1000.h: In function 'alchemy_rdsys':
../arch/mips/include/asm/mach-au1x00/au1000.h:603:36: error: implicit declaration of function 'KSEG1ADDR'; did you mean 'CKSEG1ADDR'? [-Werror=implicit-function-declaration]
603 | void __iomem *b = (void __iomem *)KSEG1ADDR(AU1000_SYS_PHYS_ADDR);
../arch/mips/include/asm/mach-au1x00/au1000.h:603:20: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
603 | void __iomem *b = (void __iomem *)KSEG1ADDR(AU1000_SYS_PHYS_ADDR);
Fixes: 04bf3b4f5fc0 ("[WATCHDOG] MTX-1 Watchdog driver")
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Wim Van Sebroeck <wim@linux-watchdog.org>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: linux-watchdog@vger.kernel.org
Cc: Florian Fainelli <f.fainelli@gmail.com>
---
drivers/watchdog/mtx-1_wdt.c | 2 --
1 file changed, 2 deletions(-)
--- linux-next-20210514.orig/drivers/watchdog/mtx-1_wdt.c
+++ linux-next-20210514/drivers/watchdog/mtx-1_wdt.c
@@ -41,8 +41,6 @@
#include <linux/uaccess.h>
#include <linux/gpio/consumer.h>
-#include <asm/mach-au1x00/au1000.h>
-
#define MTX1_WDT_INTERVAL (5 * HZ)
static int ticks = 100 * HZ;
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] watchdog: mtx-1: drop au1000.h header file
2021-05-16 21:17 [PATCH] watchdog: mtx-1: drop au1000.h header file Randy Dunlap
@ 2021-05-16 23:08 ` Guenter Roeck
2021-05-16 23:29 ` Randy Dunlap
2021-05-16 23:54 ` Florian Fainelli
1 sibling, 1 reply; 5+ messages in thread
From: Guenter Roeck @ 2021-05-16 23:08 UTC (permalink / raw)
To: Randy Dunlap, linux-kernel
Cc: Wim Van Sebroeck, linux-watchdog, Florian Fainelli
On 5/16/21 2:17 PM, Randy Dunlap wrote:
> The mtx-1_wdt driver does not need the au1000.h header file.
> Instead, the header file causes build errors, so drop it.
>
> This change fixes multiple build errors, all in au1000.h. E.g.:
>
> In file included from ../drivers/watchdog/mtx-1_wdt.c:44:
> ../arch/mips/include/asm/mach-au1x00/au1000.h: In function 'alchemy_rdsys':
> ../arch/mips/include/asm/mach-au1x00/au1000.h:603:36: error: implicit declaration of function 'KSEG1ADDR'; did you mean 'CKSEG1ADDR'? [-Werror=implicit-function-declaration]
> 603 | void __iomem *b = (void __iomem *)KSEG1ADDR(AU1000_SYS_PHYS_ADDR);
> ../arch/mips/include/asm/mach-au1x00/au1000.h:603:20: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
> 603 | void __iomem *b = (void __iomem *)KSEG1ADDR(AU1000_SYS_PHYS_ADDR);
>
> Fixes: 04bf3b4f5fc0 ("[WATCHDOG] MTX-1 Watchdog driver")
More like
Fixes: da2a68b3eb47 ("watchdog: Enable COMPILE_TEST where possible")
> Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
> Cc: Wim Van Sebroeck <wim@linux-watchdog.org>
> Cc: Guenter Roeck <linux@roeck-us.net>
> Cc: linux-watchdog@vger.kernel.org
> Cc: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> ---
> drivers/watchdog/mtx-1_wdt.c | 2 --
> 1 file changed, 2 deletions(-)
>
> --- linux-next-20210514.orig/drivers/watchdog/mtx-1_wdt.c
> +++ linux-next-20210514/drivers/watchdog/mtx-1_wdt.c
> @@ -41,8 +41,6 @@
> #include <linux/uaccess.h>
> #include <linux/gpio/consumer.h>
>
> -#include <asm/mach-au1x00/au1000.h>
> -
> #define MTX1_WDT_INTERVAL (5 * HZ)
>
> static int ticks = 100 * HZ;
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] watchdog: mtx-1: drop au1000.h header file
2021-05-16 23:08 ` Guenter Roeck
@ 2021-05-16 23:29 ` Randy Dunlap
2021-05-16 23:33 ` Guenter Roeck
0 siblings, 1 reply; 5+ messages in thread
From: Randy Dunlap @ 2021-05-16 23:29 UTC (permalink / raw)
To: Guenter Roeck, linux-kernel
Cc: Wim Van Sebroeck, linux-watchdog, Florian Fainelli
On 5/16/21 4:08 PM, Guenter Roeck wrote:
> On 5/16/21 2:17 PM, Randy Dunlap wrote:
>> The mtx-1_wdt driver does not need the au1000.h header file.
>> Instead, the header file causes build errors, so drop it.
>>
>> This change fixes multiple build errors, all in au1000.h. E.g.:
>>
>> In file included from ../drivers/watchdog/mtx-1_wdt.c:44:
>> ../arch/mips/include/asm/mach-au1x00/au1000.h: In function 'alchemy_rdsys':
>> ../arch/mips/include/asm/mach-au1x00/au1000.h:603:36: error: implicit declaration of function 'KSEG1ADDR'; did you mean 'CKSEG1ADDR'? [-Werror=implicit-function-declaration]
>> 603 | void __iomem *b = (void __iomem *)KSEG1ADDR(AU1000_SYS_PHYS_ADDR);
>> ../arch/mips/include/asm/mach-au1x00/au1000.h:603:20: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
>> 603 | void __iomem *b = (void __iomem *)KSEG1ADDR(AU1000_SYS_PHYS_ADDR);
>>
>> Fixes: 04bf3b4f5fc0 ("[WATCHDOG] MTX-1 Watchdog driver")
>
> More like
>
> Fixes: da2a68b3eb47 ("watchdog: Enable COMPILE_TEST where possible")
Duh. Thanks.
>> Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
>> Cc: Wim Van Sebroeck <wim@linux-watchdog.org>
>> Cc: Guenter Roeck <linux@roeck-us.net>
>> Cc: linux-watchdog@vger.kernel.org
>> Cc: Florian Fainelli <f.fainelli@gmail.com>
>
> Reviewed-by: Guenter Roeck <linux@roeck-us.net>
>
>> ---
>> drivers/watchdog/mtx-1_wdt.c | 2 --
>> 1 file changed, 2 deletions(-)
>>
>> --- linux-next-20210514.orig/drivers/watchdog/mtx-1_wdt.c
>> +++ linux-next-20210514/drivers/watchdog/mtx-1_wdt.c
>> @@ -41,8 +41,6 @@
>> #include <linux/uaccess.h>
>> #include <linux/gpio/consumer.h>
>> -#include <asm/mach-au1x00/au1000.h>
>> -
>> #define MTX1_WDT_INTERVAL (5 * HZ)
>> static int ticks = 100 * HZ;
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] watchdog: mtx-1: drop au1000.h header file
2021-05-16 23:29 ` Randy Dunlap
@ 2021-05-16 23:33 ` Guenter Roeck
0 siblings, 0 replies; 5+ messages in thread
From: Guenter Roeck @ 2021-05-16 23:33 UTC (permalink / raw)
To: Randy Dunlap, linux-kernel
Cc: Wim Van Sebroeck, linux-watchdog, Florian Fainelli
On 5/16/21 4:29 PM, Randy Dunlap wrote:
> On 5/16/21 4:08 PM, Guenter Roeck wrote:
>> On 5/16/21 2:17 PM, Randy Dunlap wrote:
>>> The mtx-1_wdt driver does not need the au1000.h header file.
>>> Instead, the header file causes build errors, so drop it.
>>>
>>> This change fixes multiple build errors, all in au1000.h. E.g.:
>>>
>>> In file included from ../drivers/watchdog/mtx-1_wdt.c:44:
>>> ../arch/mips/include/asm/mach-au1x00/au1000.h: In function 'alchemy_rdsys':
>>> ../arch/mips/include/asm/mach-au1x00/au1000.h:603:36: error: implicit declaration of function 'KSEG1ADDR'; did you mean 'CKSEG1ADDR'? [-Werror=implicit-function-declaration]
>>> 603 | void __iomem *b = (void __iomem *)KSEG1ADDR(AU1000_SYS_PHYS_ADDR);
>>> ../arch/mips/include/asm/mach-au1x00/au1000.h:603:20: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
>>> 603 | void __iomem *b = (void __iomem *)KSEG1ADDR(AU1000_SYS_PHYS_ADDR);
>>>
>>> Fixes: 04bf3b4f5fc0 ("[WATCHDOG] MTX-1 Watchdog driver")
>>
>> More like
>>
>> Fixes: da2a68b3eb47 ("watchdog: Enable COMPILE_TEST where possible")
>
> Duh. Thanks.
>
That patch wasn't exactly one of my better ideas.
$ git log v4.10.. | grep da2a68b3eb47
Fixes: da2a68b3eb47 ("watchdog: Enable COMPILE_TEST where possible")
Fixes: da2a68b3eb47 ("watchdog: Enable COMPILE_TEST where possible")
Commit da2a68b3eb47 ("watchdog: Enable COMPILE_TEST where possible")
Fixes: da2a68b3eb47 ("watchdog: Enable COMPILE_TEST where possible")
Fixes: da2a68b3eb47 ("watchdog: Enable COMPILE_TEST where possible")
Fixes: da2a68b3eb47 ("watchdog: Enable COMPILE_TEST where possible")
Fixes: da2a68b3eb47 ("watchdog: Enable COMPILE_TEST where possible")
Fixes: da2a68b3eb47 ("watchdog: Enable COMPILE_TEST where possible")
Fixes: da2a68b3eb47 ("watchdog: Enable COMPILE_TEST where possible")
Fixes: da2a68b3eb47 ("watchdog: Enable COMPILE_TEST where possible")
Fixes: da2a68b3eb47 ("watchdog: Enable COMPILE_TEST where possible")
Fixes: da2a68b3eb47 ("watchdog: Enable COMPILE_TEST where possible")
Fixes: da2a68b3eb47 ("watchdog: Enable COMPILE_TEST where possible")
Me blush :-(
Guenter
>>> Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
>>> Cc: Wim Van Sebroeck <wim@linux-watchdog.org>
>>> Cc: Guenter Roeck <linux@roeck-us.net>
>>> Cc: linux-watchdog@vger.kernel.org
>>> Cc: Florian Fainelli <f.fainelli@gmail.com>
>>
>> Reviewed-by: Guenter Roeck <linux@roeck-us.net>
>>
>>> ---
>>> drivers/watchdog/mtx-1_wdt.c | 2 --
>>> 1 file changed, 2 deletions(-)
>>>
>>> --- linux-next-20210514.orig/drivers/watchdog/mtx-1_wdt.c
>>> +++ linux-next-20210514/drivers/watchdog/mtx-1_wdt.c
>>> @@ -41,8 +41,6 @@
>>> #include <linux/uaccess.h>
>>> #include <linux/gpio/consumer.h>
>>> -#include <asm/mach-au1x00/au1000.h>
>>> -
>>> #define MTX1_WDT_INTERVAL (5 * HZ)
>>> static int ticks = 100 * HZ;
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] watchdog: mtx-1: drop au1000.h header file
2021-05-16 21:17 [PATCH] watchdog: mtx-1: drop au1000.h header file Randy Dunlap
2021-05-16 23:08 ` Guenter Roeck
@ 2021-05-16 23:54 ` Florian Fainelli
1 sibling, 0 replies; 5+ messages in thread
From: Florian Fainelli @ 2021-05-16 23:54 UTC (permalink / raw)
To: Randy Dunlap, linux-kernel
Cc: Wim Van Sebroeck, Guenter Roeck, linux-watchdog
On 5/16/2021 2:17 PM, Randy Dunlap wrote:
> The mtx-1_wdt driver does not need the au1000.h header file.
> Instead, the header file causes build errors, so drop it.
>
> This change fixes multiple build errors, all in au1000.h. E.g.:
>
> In file included from ../drivers/watchdog/mtx-1_wdt.c:44:
> ../arch/mips/include/asm/mach-au1x00/au1000.h: In function 'alchemy_rdsys':
> ../arch/mips/include/asm/mach-au1x00/au1000.h:603:36: error: implicit declaration of function 'KSEG1ADDR'; did you mean 'CKSEG1ADDR'? [-Werror=implicit-function-declaration]
> 603 | void __iomem *b = (void __iomem *)KSEG1ADDR(AU1000_SYS_PHYS_ADDR);
> ../arch/mips/include/asm/mach-au1x00/au1000.h:603:20: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
> 603 | void __iomem *b = (void __iomem *)KSEG1ADDR(AU1000_SYS_PHYS_ADDR);
>
> Fixes: 04bf3b4f5fc0 ("[WATCHDOG] MTX-1 Watchdog driver")
> Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
> Cc: Wim Van Sebroeck <wim@linux-watchdog.org>
> Cc: Guenter Roeck <linux@roeck-us.net>
> Cc: linux-watchdog@vger.kernel.org
> Cc: Florian Fainelli <f.fainelli@gmail.com>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
--
Florian
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-05-16 23:54 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-16 21:17 [PATCH] watchdog: mtx-1: drop au1000.h header file Randy Dunlap
2021-05-16 23:08 ` Guenter Roeck
2021-05-16 23:29 ` Randy Dunlap
2021-05-16 23:33 ` Guenter Roeck
2021-05-16 23:54 ` Florian Fainelli
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).