Commit 773fe726 authored by Joachim Eastwood's avatar Joachim Eastwood Committed by Philipp Zabel
Browse files

reset: lpc18xx: get rid of global variables for restart notifier 



Moving the notifier_block into the drivers priv struct allows us
to retrive the priv struct with container_of and remove the
global variables.

Signed-off-by: default avatarJoachim Eastwood <manabian@gmail.com>
Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
parent 0b52297f

drivers/reset/reset-lpc18xx.c

+10 −12
Original line number Original line Diff line number Diff line
@@ -35,6 +35,7 @@ 




struct lpc18xx_rgu_data {

struct lpc18xx_rgu_data {

	struct reset_controller_dev rcdev;

	struct reset_controller_dev rcdev;

	struct notifier_block restart_nb;

	struct clk *clk_delay;

	struct clk *clk_delay;

	struct clk *clk_reg;

	struct clk *clk_reg;

	void __iomem *base;

	void __iomem *base;
@@ -44,12 +45,13 @@ struct lpc18xx_rgu_data { 




#define to_rgu_data(p) container_of(p, struct lpc18xx_rgu_data, rcdev)

#define to_rgu_data(p) container_of(p, struct lpc18xx_rgu_data, rcdev)





static void __iomem *rgu_base;

static int lpc18xx_rgu_restart(struct notifier_block *nb, unsigned long mode,



static int lpc18xx_rgu_restart(struct notifier_block *this, unsigned long mode,

			       void *cmd)

			       void *cmd)

{

{

	writel(BIT(LPC18XX_RGU_CORE_RST), rgu_base + LPC18XX_RGU_CTRL0);

	struct lpc18xx_rgu_data *rc = container_of(nb, struct lpc18xx_rgu_data,

						   restart_nb);



	writel(BIT(LPC18XX_RGU_CORE_RST), rc->base + LPC18XX_RGU_CTRL0);

	mdelay(2000);

	mdelay(2000);





	pr_emerg("%s: unable to restart system\n", __func__);

	pr_emerg("%s: unable to restart system\n", __func__);
@@ -57,11 +59,6 @@ static int lpc18xx_rgu_restart(struct notifier_block *this, unsigned long mode, 
	return NOTIFY_DONE;

	return NOTIFY_DONE;

}

}





static struct notifier_block lpc18xx_rgu_restart_nb = {

	.notifier_call = lpc18xx_rgu_restart,

	.priority = 192,

};



/*

/*

 * The LPC18xx RGU has mostly self-deasserting resets except for the

 * The LPC18xx RGU has mostly self-deasserting resets except for the

 * two reset lines going to the internal Cortex-M0 cores.

 * two reset lines going to the internal Cortex-M0 cores.
@@ -205,8 +202,9 @@ static int lpc18xx_rgu_probe(struct platform_device *pdev) 
		goto dis_clks;

		goto dis_clks;

	}

	}





	rgu_base = rc->base;

	rc->restart_nb.priority = 192,

	ret = register_restart_handler(&lpc18xx_rgu_restart_nb);

	rc->restart_nb.notifier_call = lpc18xx_rgu_restart,

	ret = register_restart_handler(&rc->restart_nb);

	if (ret)

	if (ret)

		dev_warn(&pdev->dev, "failed to register restart handler\n");

		dev_warn(&pdev->dev, "failed to register restart handler\n");
@@ -225,7 +223,7 @@ static int lpc18xx_rgu_remove(struct platform_device *pdev) 
	struct lpc18xx_rgu_data *rc = platform_get_drvdata(pdev);

	struct lpc18xx_rgu_data *rc = platform_get_drvdata(pdev);

	int ret;

	int ret;





	ret = unregister_restart_handler(&lpc18xx_rgu_restart_nb);

	ret = unregister_restart_handler(&rc->restart_nb);

	if (ret)

	if (ret)

		dev_warn(&pdev->dev, "failed to unregister restart handler\n");

		dev_warn(&pdev->dev, "failed to unregister restart handler\n");