projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[linux-2.6-block.git]
/
drivers
/
ata
/
pata_mpc52xx.c
diff --git
a/drivers/ata/pata_mpc52xx.c
b/drivers/ata/pata_mpc52xx.c
index 3a8fb28b71f28df9129277167703c96706b79d96..0024ced3e2008e7a2e38b6a8715ee95fee405b2b 100644
(file)
--- a/
drivers/ata/pata_mpc52xx.c
+++ b/
drivers/ata/pata_mpc52xx.c
@@
-825,7
+825,7
@@
mpc52xx_ata_remove(struct platform_device *op)
static int
mpc52xx_ata_suspend(struct platform_device *op, pm_message_t state)
{
static int
mpc52xx_ata_suspend(struct platform_device *op, pm_message_t state)
{
- struct ata_host *host =
dev_get_drvdata(&op->dev
);
+ struct ata_host *host =
platform_get_drvdata(op
);
return ata_host_suspend(host, state);
}
return ata_host_suspend(host, state);
}
@@
-833,7
+833,7
@@
mpc52xx_ata_suspend(struct platform_device *op, pm_message_t state)
static int
mpc52xx_ata_resume(struct platform_device *op)
{
static int
mpc52xx_ata_resume(struct platform_device *op)
{
- struct ata_host *host =
dev_get_drvdata(&op->dev
);
+ struct ata_host *host =
platform_get_drvdata(op
);
struct mpc52xx_ata_priv *priv = host->private_data;
int rv;
struct mpc52xx_ata_priv *priv = host->private_data;
int rv;