Merge tag 'samsung-pinctrl-5.5' of... (6fbd92a8) · Commits · 戴 / test

drivers/pinctrl/samsung/pinctrl-exynos.c

+11 −3

Original line number	Diff line number	Diff line
		@@ -486,8 +486,10 @@ int exynos_eint_wkup_init(struct samsung_pinctrl_drv_data *d)
		if (match) {
		irq_chip = kmemdup(match->data,
		sizeof(*irq_chip), GFP_KERNEL);
		if (!irq_chip)
		if (!irq_chip) {
		of_node_put(np);
		return -ENOMEM;
		}
		wkup_np = np;
		break;
		}
		@@ -504,6 +506,7 @@ int exynos_eint_wkup_init(struct samsung_pinctrl_drv_data *d)
		bank->nr_pins, &exynos_eint_irqd_ops, bank);
		if (!bank->irq_domain) {
		dev_err(dev, "wkup irq domain add failed\n");
		of_node_put(wkup_np);
		return -ENXIO;
		}

		@@ -518,8 +521,10 @@ int exynos_eint_wkup_init(struct samsung_pinctrl_drv_data *d)
		weint_data = devm_kcalloc(dev,
		bank->nr_pins, sizeof(*weint_data),
		GFP_KERNEL);
		if (!weint_data)
		if (!weint_data) {
		of_node_put(wkup_np);
		return -ENOMEM;
		}

		for (idx = 0; idx < bank->nr_pins; ++idx) {
		irq = irq_of_parse_and_map(bank->of_node, idx);
		@@ -536,10 +541,13 @@ int exynos_eint_wkup_init(struct samsung_pinctrl_drv_data *d)
		}
		}

		if (!muxed_banks)
		if (!muxed_banks) {
		of_node_put(wkup_np);
		return 0;
		}

		irq = irq_of_parse_and_map(wkup_np, 0);
		of_node_put(wkup_np);
		if (!irq) {
		dev_err(dev, "irq number for muxed EINTs not found\n");
		return 0;

+5 −1

Original line number	Diff line number	Diff line
		@@ -490,8 +490,10 @@ static int s3c24xx_eint_init(struct samsung_pinctrl_drv_data *d)
		return -ENODEV;

		eint_data = devm_kzalloc(dev, sizeof(*eint_data), GFP_KERNEL);
		if (!eint_data)
		if (!eint_data) {
		of_node_put(eint_np);
		return -ENOMEM;
		}

		eint_data->drvdata = d;

		@@ -503,12 +505,14 @@ static int s3c24xx_eint_init(struct samsung_pinctrl_drv_data *d)
		irq = irq_of_parse_and_map(eint_np, i);
		if (!irq) {
		dev_err(dev, "failed to get wakeup EINT IRQ %d\n", i);
		of_node_put(eint_np);
		return -ENXIO;
		}

		eint_data->parents[i] = irq;
		irq_set_chained_handler_and_data(irq, handlers[i], eint_data);
		}
		of_node_put(eint_np);

		bank = d->pin_banks;
		for (i = 0; i < d->nr_banks; ++i, ++bank) {

+5 −1

Original line number	Diff line number	Diff line
		@@ -704,8 +704,10 @@ static int s3c64xx_eint_eint0_init(struct samsung_pinctrl_drv_data *d)
		return -ENODEV;

		data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
		if (!data)
		if (!data) {
		of_node_put(eint0_np);
		return -ENOMEM;
		}
		data->drvdata = d;

		for (i = 0; i < NUM_EINT0_IRQ; ++i) {
		@@ -714,6 +716,7 @@ static int s3c64xx_eint_eint0_init(struct samsung_pinctrl_drv_data *d)
		irq = irq_of_parse_and_map(eint0_np, i);
		if (!irq) {
		dev_err(dev, "failed to get wakeup EINT IRQ %d\n", i);
		of_node_put(eint0_np);
		return -ENXIO;
		}

		@@ -721,6 +724,7 @@ static int s3c64xx_eint_eint0_init(struct samsung_pinctrl_drv_data *d)
		s3c64xx_eint0_handlers[i],
		data);
		}
		of_node_put(eint0_np);

		bank = d->pin_banks;
		for (i = 0; i < d->nr_banks; ++i, ++bank) {

+8 −2

Original line number	Diff line number	Diff line
		@@ -272,6 +272,7 @@ static int samsung_dt_node_to_map(struct pinctrl_dev *pctldev,
		&reserved_maps, num_maps);
		if (ret < 0) {
		samsung_dt_free_map(pctldev, map, num_maps);
		of_node_put(np);
		return ret;
		}
		}
		@@ -785,8 +786,10 @@ static struct samsung_pmx_func *samsung_pinctrl_create_functions(
		if (!of_get_child_count(cfg_np)) {
		ret = samsung_pinctrl_create_function(dev, drvdata,
		cfg_np, func);
		if (ret < 0)
		if (ret < 0) {
		of_node_put(cfg_np);
		return ERR_PTR(ret);
		}
		if (ret > 0) {
		++func;
		++func_cnt;
		@@ -797,8 +800,11 @@ static struct samsung_pmx_func *samsung_pinctrl_create_functions(
		for_each_child_of_node(cfg_np, func_np) {
		ret = samsung_pinctrl_create_function(dev, drvdata,
		func_np, func);
		if (ret < 0)
		if (ret < 0) {
		of_node_put(func_np);
		of_node_put(cfg_np);
		return ERR_PTR(ret);
		}
		if (ret > 0) {
		++func;
		++func_cnt;