| Message ID | 20210516211703.25349-1-rdunlap@infradead.org (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | watchdog: mtx-1: drop au1000.h header file | expand |
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; >
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;
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;
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>
--- 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;
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(-)