|
@@ -493,7 +493,6 @@ static int atmel_pctl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
|
|
|
unsigned num_pins, num_configs, reserve;
|
|
|
unsigned long *configs;
|
|
|
struct property *pins;
|
|
|
- bool has_config;
|
|
|
u32 pinfunc;
|
|
|
int ret, i;
|
|
|
|
|
@@ -509,9 +508,6 @@ static int atmel_pctl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
- if (num_configs)
|
|
|
- has_config = true;
|
|
|
-
|
|
|
num_pins = pins->length / sizeof(u32);
|
|
|
if (!num_pins) {
|
|
|
dev_err(pctldev->dev, "no pins found in node %pOF\n", np);
|
|
@@ -524,7 +520,7 @@ static int atmel_pctl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
|
|
|
* map for each pin.
|
|
|
*/
|
|
|
reserve = 1;
|
|
|
- if (has_config && num_pins >= 1)
|
|
|
+ if (num_configs)
|
|
|
reserve++;
|
|
|
reserve *= num_pins;
|
|
|
ret = pinctrl_utils_reserve_map(pctldev, map, reserved_maps, num_maps,
|
|
@@ -547,7 +543,7 @@ static int atmel_pctl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
|
|
|
pinctrl_utils_add_map_mux(pctldev, map, reserved_maps, num_maps,
|
|
|
group, func);
|
|
|
|
|
|
- if (has_config) {
|
|
|
+ if (num_configs) {
|
|
|
ret = pinctrl_utils_add_map_configs(pctldev, map,
|
|
|
reserved_maps, num_maps, group,
|
|
|
configs, num_configs,
|