summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/libata-core.c
diff options
context:
space:
mode:
authorTejun Heo2006-07-26 09:58:33 +0200
committerJeff Garzik2006-07-29 10:04:55 +0200
commit3c5100c1c40cc5e27b4da4a736994c76d93392a0 (patch)
tree27060b36ff09d3423da9539fc1c796ec058aca29 /drivers/scsi/libata-core.c
parent[PATCH] ahci: implement Power Management support (diff)
downloadkernel-qcow2-linux-3c5100c1c40cc5e27b4da4a736994c76d93392a0.tar.gz
kernel-qcow2-linux-3c5100c1c40cc5e27b4da4a736994c76d93392a0.tar.xz
kernel-qcow2-linux-3c5100c1c40cc5e27b4da4a736994c76d93392a0.zip
[PATCH] libata: cosmetic changes to PM functions
Unify pm_message_t argument to the new-style @mesg. Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/scsi/libata-core.c')
-rw-r--r--drivers/scsi/libata-core.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index 386e5f21e191..66feebdb01c3 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -5767,11 +5767,11 @@ int pci_test_config_bits(struct pci_dev *pdev, const struct pci_bits *bits)
return (tmp == bits->val) ? 1 : 0;
}
-void ata_pci_device_do_suspend(struct pci_dev *pdev, pm_message_t state)
+void ata_pci_device_do_suspend(struct pci_dev *pdev, pm_message_t mesg)
{
pci_save_state(pdev);
- if (state.event == PM_EVENT_SUSPEND) {
+ if (mesg.event == PM_EVENT_SUSPEND) {
pci_disable_device(pdev);
pci_set_power_state(pdev, PCI_D3hot);
}
@@ -5785,24 +5785,24 @@ void ata_pci_device_do_resume(struct pci_dev *pdev)
pci_set_master(pdev);
}
-int ata_pci_device_suspend(struct pci_dev *pdev, pm_message_t state)
+int ata_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg)
{
struct ata_host_set *host_set = dev_get_drvdata(&pdev->dev);
int rc = 0;
- rc = ata_host_set_suspend(host_set, state);
+ rc = ata_host_set_suspend(host_set, mesg);
if (rc)
return rc;
if (host_set->next) {
- rc = ata_host_set_suspend(host_set->next, state);
+ rc = ata_host_set_suspend(host_set->next, mesg);
if (rc) {
ata_host_set_resume(host_set);
return rc;
}
}
- ata_pci_device_do_suspend(pdev, state);
+ ata_pci_device_do_suspend(pdev, mesg);
return 0;
}