Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62154991 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Linus Torvalds
Browse files

gpiolib: make names array and its values const 



gpiolib doesn't need to modify the names and I assume most initializers
use string constants that shouldn't be modified anyhow.

[akpm@linux-foundation.org: fix drivers/gpio/cs5535-gpio.c]
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Kevin Wells <kevin.wells@nxp.com>
Cc: David Brownell <david-b@pacbell.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a80a0bbe

drivers/gpio/cs5535-gpio.c

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ static int chip_direction_output(struct gpio_chip *c, unsigned offset, int val) 
	return 0;

}



static char *cs5535_gpio_names[] = {

static const char * const cs5535_gpio_names[] = {

	"GPIO0", "GPIO1", "GPIO2", "GPIO3",

	"GPIO4", "GPIO5", "GPIO6", "GPIO7",

	"GPIO8", "GPIO9", "GPIO10", "GPIO11",

drivers/gpio/gpiolib.c

+1 −1
Original line number Diff line number Diff line
@@ -722,7 +722,7 @@ int gpio_export(unsigned gpio, bool direction_may_change) 
	unsigned long		flags;

	struct gpio_desc	*desc;

	int			status = -EINVAL;

	char			*ioname = NULL;

	const char		*ioname = NULL;



	/* can't export until sysfs is available ... */

	if (!gpio_class.p) {

drivers/gpio/pca953x.c

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ struct pca953x_chip { 
	struct i2c_client *client;

	struct pca953x_platform_data *dyn_pdata;

	struct gpio_chip gpio_chip;

	char **names;

	const char *const *names;

};



static int pca953x_write_reg(struct pca953x_chip *chip, int reg, uint16_t val)

include/asm-generic/gpio.h

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ struct gpio_chip { 
						struct gpio_chip *chip);

	int			base;

	u16			ngpio;

	char			**names;

	const char		*const *names;

	unsigned		can_sleep:1;

	unsigned		exported:1;

};

include/linux/i2c/pca953x.h

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ struct pca953x_platform_data { 
	int		(*teardown)(struct i2c_client *client,

				unsigned gpio, unsigned ngpio,

				void *context);

	char		**names;

	const char	*const *names;

};



#endif /* _LINUX_PCA953X_H */