Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

firewire: fw-ohci: refactor probe, remove, suspend, resume

Browse source 
Clean up shared code and variable names.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
This commit is contained in:
Stefan Richter 2008-03-01 12:35:29 +01:00
parent eb5ca72eff
commit 2ed0f181f0
1 changed files with 43 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

101
drivers/firewire/fw-ohci.c
View file

@ -2054,6 +2054,35 @@ static const struct fw_card_driver ohci_driver = {
.stop_iso = ohci_stop_iso, .stop_iso = ohci_stop_iso,
}; };
#ifdef CONFIG_PPC_PMAC
static void ohci_pmac_on(struct pci_dev *dev)
{
if (machine_is(powermac)) {
struct device_node *ofn = pci_device_to_OF_node(dev);
if (ofn) {
pmac_call_feature(PMAC_FTR_1394_CABLE_POWER, ofn, 0, 1);
pmac_call_feature(PMAC_FTR_1394_ENABLE, ofn, 0, 1);
}
}
}
static void ohci_pmac_off(struct pci_dev *dev)
{
if (machine_is(powermac)) {
struct device_node *ofn = pci_device_to_OF_node(dev);
if (ofn) {
pmac_call_feature(PMAC_FTR_1394_ENABLE, ofn, 0, 0);
pmac_call_feature(PMAC_FTR_1394_CABLE_POWER, ofn, 0, 0);
}
}
}
#else
#define ohci_pmac_on(dev)
#define ohci_pmac_off(dev)
#endif /* CONFIG_PPC_PMAC */
static int __devinit static int __devinit
pci_probe(struct pci_dev *dev, const struct pci_device_id *ent) pci_probe(struct pci_dev *dev, const struct pci_device_id *ent)
{ {
@ -2063,17 +2092,7 @@ pci_probe(struct pci_dev *dev, const struct pci_device_id *ent)
int err; int err;
size_t size; size_t size;
#ifdef CONFIG_PPC_PMAC ohci_pmac_on(dev);
/* Necessary on some machines if fw-ohci was loaded/ unloaded before */
if (machine_is(powermac)) {
struct device_node *ofn = pci_device_to_OF_node(dev);
if (ofn) {
pmac_call_feature(PMAC_FTR_1394_CABLE_POWER, ofn, 0, 1);
pmac_call_feature(PMAC_FTR_1394_ENABLE, ofn, 0, 1);
}
}
#endif /* CONFIG_PPC_PMAC */
ohci = kzalloc(sizeof(*ohci), GFP_KERNEL); ohci = kzalloc(sizeof(*ohci), GFP_KERNEL);
if (ohci == NULL) { if (ohci == NULL) {
@ -2212,75 +2231,41 @@ static void pci_remove(struct pci_dev *dev)
pci_release_region(dev, 0); pci_release_region(dev, 0);
pci_disable_device(dev); pci_disable_device(dev);
kfree(&ohci->card); kfree(&ohci->card);
ohci_pmac_off(dev);
#ifdef CONFIG_PPC_PMAC
/* On UniNorth, power down the cable and turn off the chip clock
* to save power on laptops */
if (machine_is(powermac)) {
struct device_node *ofn = pci_device_to_OF_node(dev);
if (ofn) {
pmac_call_feature(PMAC_FTR_1394_ENABLE, ofn, 0, 0);
pmac_call_feature(PMAC_FTR_1394_CABLE_POWER, ofn, 0, 0);
}
}
#endif /* CONFIG_PPC_PMAC */
fw_notify("Removed fw-ohci device.\n"); fw_notify("Removed fw-ohci device.\n");
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int pci_suspend(struct pci_dev *pdev, pm_message_t state) static int pci_suspend(struct pci_dev *dev, pm_message_t state)
{ {
struct fw_ohci *ohci = pci_get_drvdata(pdev); struct fw_ohci *ohci = pci_get_drvdata(dev);
int err; int err;
software_reset(ohci); software_reset(ohci);
free_irq(pdev->irq, ohci); free_irq(dev->irq, ohci);
err = pci_save_state(pdev); err = pci_save_state(dev);
if (err) { if (err) {
fw_error("pci_save_state failed\n"); fw_error("pci_save_state failed\n");
return err; return err;
} }
err = pci_set_power_state(pdev, pci_choose_state(pdev, state)); err = pci_set_power_state(dev, pci_choose_state(dev, state));
if (err) if (err)
fw_error("pci_set_power_state failed with %d\n", err); fw_error("pci_set_power_state failed with %d\n", err);
ohci_pmac_off(dev);
/* PowerMac suspend code comes last */
#ifdef CONFIG_PPC_PMAC
if (machine_is(powermac)) {
struct device_node *ofn = pci_device_to_OF_node(pdev);
if (ofn) {
pmac_call_feature(PMAC_FTR_1394_ENABLE, ofn, 0, 0);
pmac_call_feature(PMAC_FTR_1394_CABLE_POWER, ofn, 0, 0);
}
}
#endif /* CONFIG_PPC_PMAC */
return 0; return 0;
} }
static int pci_resume(struct pci_dev *pdev) static int pci_resume(struct pci_dev *dev)
{ {
struct fw_ohci *ohci = pci_get_drvdata(pdev); struct fw_ohci *ohci = pci_get_drvdata(dev);
int err; int err;
/* PowerMac resume code comes first */ ohci_pmac_on(dev);
#ifdef CONFIG_PPC_PMAC pci_set_power_state(dev, PCI_D0);
if (machine_is(powermac)) { pci_restore_state(dev);
struct device_node *ofn = pci_device_to_OF_node(pdev); err = pci_enable_device(dev);
if (ofn) {
pmac_call_feature(PMAC_FTR_1394_CABLE_POWER, ofn, 0, 1);
pmac_call_feature(PMAC_FTR_1394_ENABLE, ofn, 0, 1);
}
}
#endif /* CONFIG_PPC_PMAC */
pci_set_power_state(pdev, PCI_D0);
pci_restore_state(pdev);
err = pci_enable_device(pdev);
if (err) { if (err) {
fw_error("pci_enable_device failed\n"); fw_error("pci_enable_device failed\n");
return err; return err;