aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/power
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2014-09-30 10:48:30 -0700
committerSebastian Reichel <sre@kernel.org>2014-11-17 03:07:09 +0100
commit43160718d95db9e2336cd787fa8fcad39660b883 (patch)
treeca55ca3074d5d70b47221db65757a2f43b9ab696 /drivers/power
parentpower/reset: xgene: Drop devm_kfree (diff)
downloadlinux-dev-43160718d95db9e2336cd787fa8fcad39660b883.tar.xz
linux-dev-43160718d95db9e2336cd787fa8fcad39660b883.zip
power/reset: xgene: Use local variable dev instead of pdev->dev
Using a local variable dev to point to the device is simpler then repeatedly dereferencing pdev->dev. Cc: Loc Ho <lho@apm.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/reset/xgene-reboot.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/power/reset/xgene-reboot.c b/drivers/power/reset/xgene-reboot.c
index c49a3fee65e7..94f10ad4100c 100644
--- a/drivers/power/reset/xgene-reboot.c
+++ b/drivers/power/reset/xgene-reboot.c
@@ -33,7 +33,7 @@
#include <asm/system_misc.h>
struct xgene_reboot_context {
- struct platform_device *pdev;
+ struct device *dev;
void *csr;
u32 mask;
};
@@ -53,27 +53,28 @@ static void xgene_restart(enum reboot_mode mode, const char *cmd)
while (time_before(jiffies, timeout))
cpu_relax();
- dev_emerg(&ctx->pdev->dev, "Unable to restart system\n");
+ dev_emerg(ctx->dev, "Unable to restart system\n");
}
static int xgene_reboot_probe(struct platform_device *pdev)
{
struct xgene_reboot_context *ctx;
+ struct device *dev = &pdev->dev;
- ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_KERNEL);
+ ctx = devm_kzalloc(dev, sizeof(*ctx), GFP_KERNEL);
if (!ctx)
return -ENOMEM;
- ctx->csr = of_iomap(pdev->dev.of_node, 0);
+ ctx->csr = of_iomap(dev->of_node, 0);
if (!ctx->csr) {
- dev_err(&pdev->dev, "can not map resource\n");
+ dev_err(dev, "can not map resource\n");
return -ENODEV;
}
- if (of_property_read_u32(pdev->dev.of_node, "mask", &ctx->mask))
+ if (of_property_read_u32(dev->of_node, "mask", &ctx->mask))
ctx->mask = 0xFFFFFFFF;
- ctx->pdev = pdev;
+ ctx->dev = dev;
arm_pm_restart = xgene_restart;
xgene_restart_ctx = ctx;