niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

pinctrl: shut up a couple of pinctrl warnings

Browse source 
So, I notice that we get a couple of warnings from the pinctrl code:

drivers/pinctrl/pinconf.c: In function 'pinconf_dbg_config_print':
drivers/pinctrl/pinconf.c:433:36: warning: 'configs' may be used uninitialized in this function
drivers/pinctrl/pinconf.c: In function 'pinconf_dbg_config_write':
drivers/pinctrl/pinconf.c:511:36: warning: 'configs' may be used uninitialized in this function

While the compiler might not be able to work out that "configs" is
safe, the code doesn't lend itself very well to identifying that
fact when reading it either.  This can be trivially solved by a slight
restructuring of the code - which also reduces the LOC.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Russell King - ARM Linux 2013-07-28 13:13:00 +01:00 • committed by Linus Walleij
parent cdaf0645db
commit 8a9dcc3ffe
1 changed files with 11 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
drivers/pinctrl/pinconf.c
View file

@ -428,12 +428,11 @@ static int pinconf_dbg_config_print(struct seq_file *s, void *d)
{ {
struct pinctrl_maps *maps_node; struct pinctrl_maps *maps_node;
const struct pinctrl_map *map; const struct pinctrl_map *map;
struct pinctrl_dev *pctldev = NULL; const struct pinctrl_map *found = NULL;
struct pinctrl_dev *pctldev;
const struct pinconf_ops *confops = NULL; const struct pinconf_ops *confops = NULL;
const struct pinctrl_map_configs *configs;
struct dbg_cfg *dbg = &pinconf_dbg_conf; struct dbg_cfg *dbg = &pinconf_dbg_conf;
int i, j; int i, j;
bool found = false;
unsigned long config; unsigned long config;
mutex_lock(&pinctrl_maps_mutex); mutex_lock(&pinctrl_maps_mutex);
@ -450,14 +449,8 @@ static int pinconf_dbg_config_print(struct seq_file *s, void *d)
for (j = 0; j < map->data.configs.num_configs; j++) { for (j = 0; j < map->data.configs.num_configs; j++) {
if (!strcmp(map->data.configs.group_or_pin, if (!strcmp(map->data.configs.group_or_pin,
dbg->pin_name)) { dbg->pin_name)) {
/* /* We found the right pin / state */
* We found the right pin / state, read the found = map;
* config and he pctldev for later use
*/
configs = &map->data.configs;
pctldev = get_pinctrl_dev_from_devname
(map->ctrl_dev_name);
found = true;
break; break;
} }
} }
@ -473,7 +466,8 @@ static int pinconf_dbg_config_print(struct seq_file *s, void *d)
goto exit; goto exit;
} }
config = *(configs->configs); pctldev = get_pinctrl_dev_from_devname(found->ctrl_dev_name);
config = *found->data.configs.configs;
seq_printf(s, "Dev %s has config of %s in state %s: 0x%08lX\n", seq_printf(s, "Dev %s has config of %s in state %s: 0x%08lX\n",
dbg->dev_name, dbg->pin_name, dbg->dev_name, dbg->pin_name,
dbg->state_name, config); dbg->state_name, config);
@ -505,12 +499,12 @@ static int pinconf_dbg_config_write(struct file *file,
{ {
struct pinctrl_maps *maps_node; struct pinctrl_maps *maps_node;
const struct pinctrl_map *map; const struct pinctrl_map *map;
struct pinctrl_dev *pctldev = NULL; const struct pinctrl_map *found = NULL;
struct pinctrl_dev *pctldev;
const struct pinconf_ops *confops = NULL; const struct pinconf_ops *confops = NULL;
struct dbg_cfg *dbg = &pinconf_dbg_conf; struct dbg_cfg *dbg = &pinconf_dbg_conf;
const struct pinctrl_map_configs *configs; const struct pinctrl_map_configs *configs;
char config[MAX_NAME_LEN+1]; char config[MAX_NAME_LEN+1];
bool found = false;
char buf[128]; char buf[128];
char *b = &buf[0]; char *b = &buf[0];
int buf_size; int buf_size;
@ -588,10 +582,7 @@ static int pinconf_dbg_config_write(struct file *file,
/* we found the right pin / state, so overwrite config */ /* we found the right pin / state, so overwrite config */
if (!strcmp(map->data.configs.group_or_pin, dbg->pin_name)) { if (!strcmp(map->data.configs.group_or_pin, dbg->pin_name)) {
found = true; found = map;
pctldev = get_pinctrl_dev_from_devname(
map->ctrl_dev_name);
configs = &map->data.configs;
break; break;
} }
} }
@ -601,10 +592,12 @@ static int pinconf_dbg_config_write(struct file *file,
goto exit; goto exit;
} }
pctldev = get_pinctrl_dev_from_devname(found->ctrl_dev_name);
if (pctldev) if (pctldev)
confops = pctldev->desc->confops; confops = pctldev->desc->confops;
if (confops && confops->pin_config_dbg_parse_modify) { if (confops && confops->pin_config_dbg_parse_modify) {
configs = &found->data.configs;
for (i = 0; i < configs->num_configs; i++) { for (i = 0; i < configs->num_configs; i++) {
confops->pin_config_dbg_parse_modify(pctldev, confops->pin_config_dbg_parse_modify(pctldev,
config, config,