Message ID | 20170511114822.2951151-1-arnd@arndb.de (mailing list archive) |
---|---|
State | Accepted |
Headers | show |
On Thu, May 11, 2017 at 01:48:04PM +0200, Arnd Bergmann wrote: > gcc-7 warns about 'const SIMPLE_DEV_PM_OPS', as that macro already constains > a 'const' keyword: > > drivers/input/keyboard/cros_ec_keyb.c:663:14: error: duplicate 'const' declaration specifier [-Werror=duplicate-decl-specifier] > static const SIMPLE_DEV_PM_OPS(cros_ec_keyb_pm_ops, NULL, cros_ec_keyb_resume); > > This removes the extra one. > > Fixes: 6af6dc2d2aa6 ("input: Add ChromeOS EC keyboard driver") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Applied, thank you. > --- > drivers/input/keyboard/cros_ec_keyb.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/input/keyboard/cros_ec_keyb.c b/drivers/input/keyboard/cros_ec_keyb.c > index c7a8120b13c0..79eb29550c34 100644 > --- a/drivers/input/keyboard/cros_ec_keyb.c > +++ b/drivers/input/keyboard/cros_ec_keyb.c > @@ -660,7 +660,7 @@ static const struct of_device_id cros_ec_keyb_of_match[] = { > MODULE_DEVICE_TABLE(of, cros_ec_keyb_of_match); > #endif > > -static const SIMPLE_DEV_PM_OPS(cros_ec_keyb_pm_ops, NULL, cros_ec_keyb_resume); > +static SIMPLE_DEV_PM_OPS(cros_ec_keyb_pm_ops, NULL, cros_ec_keyb_resume); > > static struct platform_driver cros_ec_keyb_driver = { > .probe = cros_ec_keyb_probe, > -- > 2.9.0 >
diff --git a/drivers/input/keyboard/cros_ec_keyb.c b/drivers/input/keyboard/cros_ec_keyb.c index c7a8120b13c0..79eb29550c34 100644 --- a/drivers/input/keyboard/cros_ec_keyb.c +++ b/drivers/input/keyboard/cros_ec_keyb.c @@ -660,7 +660,7 @@ static const struct of_device_id cros_ec_keyb_of_match[] = { MODULE_DEVICE_TABLE(of, cros_ec_keyb_of_match); #endif -static const SIMPLE_DEV_PM_OPS(cros_ec_keyb_pm_ops, NULL, cros_ec_keyb_resume); +static SIMPLE_DEV_PM_OPS(cros_ec_keyb_pm_ops, NULL, cros_ec_keyb_resume); static struct platform_driver cros_ec_keyb_driver = { .probe = cros_ec_keyb_probe,
gcc-7 warns about 'const SIMPLE_DEV_PM_OPS', as that macro already constains a 'const' keyword: drivers/input/keyboard/cros_ec_keyb.c:663:14: error: duplicate 'const' declaration specifier [-Werror=duplicate-decl-specifier] static const SIMPLE_DEV_PM_OPS(cros_ec_keyb_pm_ops, NULL, cros_ec_keyb_resume); This removes the extra one. Fixes: 6af6dc2d2aa6 ("input: Add ChromeOS EC keyboard driver") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/input/keyboard/cros_ec_keyb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)