Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-12 16:19:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[PATCH] libata: cosmetic changes to PM functions

Browse Source 
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>
This commit is contained in:
Tejun Heo 2006-07-26 16:58:33 +09:00 committed by Jeff Garzik
parent c1332875cb
commit 3c5100c1c4
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/scsi/libata-core.c
View File

@ -5767,11 +5767,11 @@ int pci_test_config_bits(struct pci_dev *pdev, const struct pci_bits *bits)
return (tmp == bits->val) ? 1 : 0; 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); pci_save_state(pdev);
if (state.event == PM_EVENT_SUSPEND) { if (mesg.event == PM_EVENT_SUSPEND) {
pci_disable_device(pdev); pci_disable_device(pdev);
pci_set_power_state(pdev, PCI_D3hot); 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); 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); struct ata_host_set *host_set = dev_get_drvdata(&pdev->dev);
int rc = 0; int rc = 0;
rc = ata_host_set_suspend(host_set, state); rc = ata_host_set_suspend(host_set, mesg);
if (rc) if (rc)
return rc; return rc;
if (host_set->next) { if (host_set->next) {
rc = ata_host_set_suspend(host_set->next, state); rc = ata_host_set_suspend(host_set->next, mesg);
if (rc) { if (rc) {
ata_host_set_resume(host_set); ata_host_set_resume(host_set);
return rc; return rc;
} }
} }
ata_pci_device_do_suspend(pdev, state); ata_pci_device_do_suspend(pdev, mesg);
return 0; return 0;
} }

8
drivers/scsi/libata-scsi.c
View File

@ -400,7 +400,7 @@ void ata_dump_status(unsigned id, struct ata_taskfile *tf)
/** /**
* ata_scsi_device_suspend - suspend ATA device associated with sdev * ata_scsi_device_suspend - suspend ATA device associated with sdev
* @sdev: the SCSI device to suspend * @sdev: the SCSI device to suspend
* @state: target power management state * @mesg: target power management message
* *
* Request suspend EH action on the ATA device associated with * Request suspend EH action on the ATA device associated with
* @sdev and wait for the operation to complete. * @sdev and wait for the operation to complete.
@ -411,7 +411,7 @@ void ata_dump_status(unsigned id, struct ata_taskfile *tf)
* RETURNS: * RETURNS:
* 0 on success, -errno otherwise. * 0 on success, -errno otherwise.
*/ */
int ata_scsi_device_suspend(struct scsi_device *sdev, pm_message_t state) int ata_scsi_device_suspend(struct scsi_device *sdev, pm_message_t mesg)
{ {
struct ata_port *ap = ata_shost_to_port(sdev->host); struct ata_port *ap = ata_shost_to_port(sdev->host);
struct ata_device *dev = ata_scsi_find_dev(ap, sdev); struct ata_device *dev = ata_scsi_find_dev(ap, sdev);
@ -438,7 +438,7 @@ int ata_scsi_device_suspend(struct scsi_device *sdev, pm_message_t state)
/* request suspend */ /* request suspend */
action = ATA_EH_SUSPEND; action = ATA_EH_SUSPEND;
if (state.event != PM_EVENT_SUSPEND) if (mesg.event != PM_EVENT_SUSPEND)
action |= ATA_EH_PM_FREEZE; action |= ATA_EH_PM_FREEZE;
ap->eh_info.dev_action[dev->devno] |= action; ap->eh_info.dev_action[dev->devno] |= action;
ap->eh_info.flags |= ATA_EHI_QUIET; ap->eh_info.flags |= ATA_EHI_QUIET;
@ -463,7 +463,7 @@ int ata_scsi_device_suspend(struct scsi_device *sdev, pm_message_t state)
spin_unlock_irqrestore(ap->lock, flags); spin_unlock_irqrestore(ap->lock, flags);
out: out:
if (rc == 0) if (rc == 0)
sdev->sdev_gendev.power.power_state = state; sdev->sdev_gendev.power.power_state = mesg;
return rc; return rc;
} }

6
include/linux/libata.h
View File

@ -676,9 +676,9 @@ extern void ata_std_ports(struct ata_ioports *ioaddr);
extern int ata_pci_init_one (struct pci_dev *pdev, struct ata_port_info **port_info, extern int ata_pci_init_one (struct pci_dev *pdev, struct ata_port_info **port_info,
unsigned int n_ports); unsigned int n_ports);
extern void ata_pci_remove_one (struct pci_dev *pdev); extern void ata_pci_remove_one (struct pci_dev *pdev);
extern void ata_pci_device_do_suspend(struct pci_dev *pdev, pm_message_t state); extern void ata_pci_device_do_suspend(struct pci_dev *pdev, pm_message_t mesg);
extern void ata_pci_device_do_resume(struct pci_dev *pdev); extern void ata_pci_device_do_resume(struct pci_dev *pdev);
extern int ata_pci_device_suspend(struct pci_dev *pdev, pm_message_t state); extern int ata_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg);
extern int ata_pci_device_resume(struct pci_dev *pdev); extern int ata_pci_device_resume(struct pci_dev *pdev);
extern int ata_pci_clear_simplex(struct pci_dev *pdev); extern int ata_pci_clear_simplex(struct pci_dev *pdev);
#endif /* CONFIG_PCI */ #endif /* CONFIG_PCI */
@ -697,7 +697,7 @@ extern int sata_scr_write_flush(struct ata_port *ap, int reg, u32 val);
extern int ata_port_online(struct ata_port *ap); extern int ata_port_online(struct ata_port *ap);
extern int ata_port_offline(struct ata_port *ap); extern int ata_port_offline(struct ata_port *ap);
extern int ata_scsi_device_resume(struct scsi_device *); extern int ata_scsi_device_resume(struct scsi_device *);
extern int ata_scsi_device_suspend(struct scsi_device *, pm_message_t state); extern int ata_scsi_device_suspend(struct scsi_device *, pm_message_t mesg);
extern int ata_host_set_suspend(struct ata_host_set *host_set, extern int ata_host_set_suspend(struct ata_host_set *host_set,
pm_message_t mesg); pm_message_t mesg);
extern void ata_host_set_resume(struct ata_host_set *host_set); extern void ata_host_set_resume(struct ata_host_set *host_set);