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

Commit eacd8d09 authored by Alexandre Belloni's avatar Alexandre Belloni Committed by Sebastian Reichel
Browse files

power/reset: at91-reset: remove useless at91_reset_platform_probe() 



Since all the at91 platforms are now DT only, at91_reset_platform_probe()
is now useless, remove it.

Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: default avatarSebastian Reichel <sre@kernel.org>
parent 2a9123f1

drivers/power/reset/at91-reset.c

+3 −44
Original line number Diff line number Diff line
@@ -178,11 +178,11 @@ static struct notifier_block at91_restart_nb = { 
	.priority = 192,

};



static int at91_reset_of_probe(struct platform_device *pdev)

static int at91_reset_probe(struct platform_device *pdev)

{

	const struct of_device_id *match;

	struct device_node *np;

	int idx = 0;

	int ret, idx = 0;



	at91_rstc_base = of_iomap(pdev->dev.of_node, 0);

	if (!at91_rstc_base) {
@@ -204,49 +204,8 @@ static int at91_reset_of_probe(struct platform_device *pdev) 


	match = of_match_node(at91_reset_of_match, pdev->dev.of_node);

	at91_restart_nb.notifier_call = match->data;

	return register_restart_handler(&at91_restart_nb);

}



static int at91_reset_platform_probe(struct platform_device *pdev)

{

	const struct platform_device_id *match;

	struct resource *res;

	int idx = 0;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	at91_rstc_base = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(at91_rstc_base)) {

		dev_err(&pdev->dev, "Could not map reset controller address\n");

		return PTR_ERR(at91_rstc_base);

	}



	for (idx = 0; idx < 2; idx++) {

		res = platform_get_resource(pdev, IORESOURCE_MEM, idx + 1 );

		at91_ramc_base[idx] = devm_ioremap(&pdev->dev, res->start,

						   resource_size(res));

		if (!at91_ramc_base[idx]) {

			dev_err(&pdev->dev, "Could not map ram controller address\n");

			return -ENOMEM;

		}

	}



	match = platform_get_device_id(pdev);

	at91_restart_nb.notifier_call =

		(int (*)(struct notifier_block *,

			 unsigned long, void *)) match->driver_data;



	return register_restart_handler(&at91_restart_nb);

}



static int at91_reset_probe(struct platform_device *pdev)

{

	int ret;



	if (pdev->dev.of_node)

		ret = at91_reset_of_probe(pdev);

	else

		ret = at91_reset_platform_probe(pdev);



	ret = register_restart_handler(&at91_restart_nb);

	if (ret)

		return ret;