diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-10-29 19:58:25 +0100 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-12-07 21:32:53 +0100 |
| commit | 5f8d17f6023ea9aca7c0063c5b472529f2664944 (patch) | |
| tree | 0a6c84cc5f02f35dae5488fcf1ed9db3e6559e81 /drivers/ieee1394 | |
| parent | 2a3f8ad3a94c784f57958bd692428cb342ce4114 (diff) | |
| download | linux-5f8d17f6023ea9aca7c0063c5b472529f2664944.tar.gz | |
ieee1394: ohci1394: proper log messages in suspend and resume
- correct thinko in one of my last commits: cannot use PRINT macro with
ohci == NULL
- add log messages on ohci == NULL and on pci_enable_device != 0
- update log macros from patch "revert fail on error in suspend" to use
PRINT and DBGMSG where possible
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/ieee1394')
| -rw-r--r-- | drivers/ieee1394/ohci1394.c | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c index 44adefd71684f..406b7501b9b70 100644 --- a/drivers/ieee1394/ohci1394.c +++ b/drivers/ieee1394/ohci1394.c @@ -3537,9 +3537,12 @@ static int ohci1394_pci_suspend(struct pci_dev *pdev, pm_message_t state) printk(KERN_INFO "%s does not fully support suspend and resume yet\n", OHCI1394_DRIVER_NAME); - PRINT(KERN_DEBUG, "suspend called"); - if (!ohci) + if (!ohci) { + printk(KERN_ERR "%s: tried to suspend nonexisting host\n", + OHCI1394_DRIVER_NAME); return -ENXIO; + } + DBGMSG("suspend called"); /* Clear the async DMA contexts and stop using the controller */ hpsb_bus_reset(ohci->host); @@ -3562,16 +3565,12 @@ static int ohci1394_pci_suspend(struct pci_dev *pdev, pm_message_t state) err = pci_save_state(pdev); if (err) { - printk(KERN_ERR "%s: pci_save_state failed with %d\n", - OHCI1394_DRIVER_NAME, err); + PRINT(KERN_ERR, "pci_save_state failed with %d", err); return err; } err = pci_set_power_state(pdev, pci_choose_state(pdev, state)); -#ifdef OHCI1394_DEBUG if (err) - printk(KERN_DEBUG "%s: pci_set_power_state failed with %d\n", - OHCI1394_DRIVER_NAME, err); -#endif /* OHCI1394_DEBUG */ + DBGMSG("pci_set_power_state failed with %d", err); /* PowerMac suspend code comes last */ #ifdef CONFIG_PPC_PMAC @@ -3593,9 +3592,12 @@ static int ohci1394_pci_resume(struct pci_dev *pdev) int err; struct ti_ohci *ohci = pci_get_drvdata(pdev); - PRINT(KERN_DEBUG, "resume called"); - if (!ohci) + if (!ohci) { + printk(KERN_ERR "%s: tried to resume nonexisting host\n", + OHCI1394_DRIVER_NAME); return -ENXIO; + } + DBGMSG("resume called"); /* PowerMac resume code comes first */ #ifdef CONFIG_PPC_PMAC @@ -3612,8 +3614,10 @@ static int ohci1394_pci_resume(struct pci_dev *pdev) pci_set_power_state(pdev, PCI_D0); pci_restore_state(pdev); err = pci_enable_device(pdev); - if (err) + if (err) { + PRINT(KERN_ERR, "pci_enable_device failed with %d", err); return err; + } /* See ohci1394_pci_probe() for comments on this sequence */ ohci_soft_reset(ohci); |