Merge tag 'sh-pfc-for-v5.4-tag1' of... (76837e02) · Commits · 戴 / test

drivers/pinctrl/pinctrl-rza1.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -1359,7 +1359,6 @@ static int rza1_pinctrl_register(struct rza1_pinctrl *rza1_pctl)
		static int rza1_pinctrl_probe(struct platform_device *pdev)
		{
		struct rza1_pinctrl *rza1_pctl;
		struct resource *res;
		int ret;

		rza1_pctl = devm_kzalloc(&pdev->dev, sizeof(*rza1_pctl), GFP_KERNEL);
		@@ -1368,8 +1367,7 @@ static int rza1_pinctrl_probe(struct platform_device *pdev)

		rza1_pctl->dev = &pdev->dev;

		res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
		rza1_pctl->base = devm_ioremap_resource(&pdev->dev, res);
		rza1_pctl->base = devm_platform_ioremap_resource(pdev, 0);
		if (IS_ERR(rza1_pctl->base))
		return PTR_ERR(rza1_pctl->base);

+9 −3

Original line number	Diff line number	Diff line
		@@ -412,9 +412,11 @@ static int rzn1_dt_node_to_map(struct pinctrl_dev *pctldev,

		for_each_child_of_node(np, child) {
		ret = rzn1_dt_node_to_map_one(pctldev, child, map, num_maps);
		if (ret < 0)
		if (ret < 0) {
		of_node_put(child);
		return ret;
		}
		}

		return 0;
		}
		@@ -792,8 +794,10 @@ static int rzn1_pinctrl_parse_functions(struct device_node *np,
		grp = &ipctl->groups[ipctl->ngroups];
		grp->func = func->name;
		ret = rzn1_pinctrl_parse_groups(child, grp, ipctl);
		if (ret < 0)
		if (ret < 0) {
		of_node_put(child);
		return ret;
		}
		i++;
		ipctl->ngroups++;
		}
		@@ -838,9 +842,11 @@ static int rzn1_pinctrl_probe_dt(struct platform_device *pdev,

		for_each_child_of_node(np, child) {
		ret = rzn1_pinctrl_parse_functions(child, ipctl, i++);
		if (ret < 0)
		if (ret < 0) {
		of_node_put(child);
		return ret;
		}
		}

		return 0;
		}

+2 −7

Original line number	Diff line number	Diff line
		@@ -255,18 +255,13 @@ static int gpio_pin_setup(struct sh_pfc_chip *chip)
		#ifdef CONFIG_PINCTRL_SH_FUNC_GPIO
		static int gpio_function_request(struct gpio_chip *gc, unsigned offset)
		{
		static bool __print_once;
		struct sh_pfc *pfc = gpio_to_pfc(gc);
		unsigned int mark = pfc->info->func_gpios[offset].enum_id;
		unsigned long flags;
		int ret;

		if (!__print_once) {
		dev_notice(pfc->dev,
		"Use of GPIO API for function requests is deprecated."
		" Convert to pinctrl\n");
		__print_once = true;
		}
		dev_notice_once(pfc->dev,
		"Use of GPIO API for function requests is deprecated, convert to pinctrl\n");

		if (mark == 0)
		return -EINVAL;