2017-08-16 05:41:56

by Arvind Yadav

Subject: [PATCH] Input: i8042: constify pnp_device_id

pnp_device_id are not supposed to change at runtime. All functions
working with pnp_device_id provided by <linux/pnp.h> work with
const pnp_device_id. So mark the non-const structs as const.

Signed-off-by: Arvind Yadav <[email protected]>
---
drivers/input/serio/i8042-x86ia64io.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index f932a83..ae81e57 100644
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -927,7 +927,7 @@ static int i8042_pnp_aux_probe(struct pnp_dev *dev, const struct pnp_device_id *
return 0;
}

-static struct pnp_device_id pnp_kbd_devids[] = {
+static const struct pnp_device_id pnp_kbd_devids[] = {
{ .id = "PNP0300", .driver_data = 0 },
{ .id = "PNP0301", .driver_data = 0 },
{ .id = "PNP0302", .driver_data = 0 },
@@ -957,7 +957,7 @@ static struct pnp_driver i8042_pnp_kbd_driver = {
},
};

-static struct pnp_device_id pnp_aux_devids[] = {
+static const struct pnp_device_id pnp_aux_devids[] = {
{ .id = "AUI0200", .driver_data = 0 },
{ .id = "FJC6000", .driver_data = 0 },
{ .id = "FJC6001", .driver_data = 0 },
--
2.7.4

2017-08-17 00:43:42

by Dmitry Torokhov

Subject: Re: [PATCH] Input: i8042: constify pnp_device_id

On Wed, Aug 16, 2017 at 11:11:42AM +0530, Arvind Yadav wrote:
> pnp_device_id are not supposed to change at runtime. All functions
> working with pnp_device_id provided by <linux/pnp.h> work with
> const pnp_device_id. So mark the non-const structs as const.
>
> Signed-off-by: Arvind Yadav <[email protected]>

Applied, thank you.

> ---
> drivers/input/serio/i8042-x86ia64io.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
> index f932a83..ae81e57 100644
> --- a/drivers/input/serio/i8042-x86ia64io.h
> +++ b/drivers/input/serio/i8042-x86ia64io.h
> @@ -927,7 +927,7 @@ static int i8042_pnp_aux_probe(struct pnp_dev *dev, const struct pnp_device_id *
> return 0;
> }
>
> -static struct pnp_device_id pnp_kbd_devids[] = {
> +static const struct pnp_device_id pnp_kbd_devids[] = {
> { .id = "PNP0300", .driver_data = 0 },
> { .id = "PNP0301", .driver_data = 0 },
> { .id = "PNP0302", .driver_data = 0 },
> @@ -957,7 +957,7 @@ static struct pnp_driver i8042_pnp_kbd_driver = {
> },
> };
>
> -static struct pnp_device_id pnp_aux_devids[] = {
> +static const struct pnp_device_id pnp_aux_devids[] = {
> { .id = "AUI0200", .driver_data = 0 },
> { .id = "FJC6000", .driver_data = 0 },
> { .id = "FJC6001", .driver_data = 0 },
> --
> 2.7.4
>

--
Dmitry