lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ieee1394: ohci1394: 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:36:42 +01:00
parent 38275ac36d
commit b25d166616
1 changed files with 49 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
drivers/ieee1394/ohci1394.c
View File

@@ -2993,15 +2993,9 @@ do { \
return err; \ return err; \
} while (0) } while (0)
static int __devinit ohci1394_pci_probe(struct pci_dev *dev,
const struct pci_device_id *ent)
{
struct hpsb_host *host;
struct ti_ohci *ohci; /* shortcut to currently handled device */
resource_size_t ohci_base;
#ifdef CONFIG_PPC_PMAC #ifdef CONFIG_PPC_PMAC
/* Necessary on some machines if ohci1394 was loaded/ unloaded before */ static void ohci1394_pmac_on(struct pci_dev *dev)
{
if (machine_is(powermac)) { if (machine_is(powermac)) {
struct device_node *ofn = pci_device_to_OF_node(dev); struct device_node *ofn = pci_device_to_OF_node(dev);
@@ -3010,8 +3004,32 @@ static int __devinit ohci1394_pci_probe(struct pci_dev *dev,
pmac_call_feature(PMAC_FTR_1394_ENABLE, ofn, 0, 1); pmac_call_feature(PMAC_FTR_1394_ENABLE, ofn, 0, 1);
} }
} }
}
static void ohci1394_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 ohci1394_pmac_on(dev)
#define ohci1394_pmac_off(dev)
#endif /* CONFIG_PPC_PMAC */ #endif /* CONFIG_PPC_PMAC */
static int __devinit ohci1394_pci_probe(struct pci_dev *dev,
const struct pci_device_id *ent)
{
struct hpsb_host *host;
struct ti_ohci *ohci; /* shortcut to currently handled device */
resource_size_t ohci_base;
ohci1394_pmac_on(dev);
if (pci_enable_device(dev)) if (pci_enable_device(dev))
FAIL(-ENXIO, "Failed to enable OHCI hardware"); FAIL(-ENXIO, "Failed to enable OHCI hardware");
pci_set_master(dev); pci_set_master(dev);
@@ -3203,16 +3221,16 @@ static int __devinit ohci1394_pci_probe(struct pci_dev *dev,
#undef FAIL #undef FAIL
} }
static void ohci1394_pci_remove(struct pci_dev *pdev) static void ohci1394_pci_remove(struct pci_dev *dev)
{ {
struct ti_ohci *ohci; struct ti_ohci *ohci;
struct device *dev; struct device *device;
ohci = pci_get_drvdata(pdev); ohci = pci_get_drvdata(dev);
if (!ohci) if (!ohci)
return; return;
dev = get_device(&ohci->host->device); device = get_device(&ohci->host->device);
switch (ohci->init_state) { switch (ohci->init_state) {
case OHCI_INIT_DONE: case OHCI_INIT_DONE:
@@ -3246,7 +3264,7 @@ static void ohci1394_pci_remove(struct pci_dev *pdev)
/* Soft reset before we start - this disables /* Soft reset before we start - this disables
* interrupts and clears linkEnable and LPS. */ * interrupts and clears linkEnable and LPS. */
ohci_soft_reset(ohci); ohci_soft_reset(ohci);
free_irq(ohci->dev->irq, ohci); free_irq(dev->irq, ohci);
case OHCI_INIT_HAVE_TXRX_BUFFERS__MAYBE: case OHCI_INIT_HAVE_TXRX_BUFFERS__MAYBE:
/* The ohci_soft_reset() stops all DMA contexts, so we /* The ohci_soft_reset() stops all DMA contexts, so we
@@ -3257,12 +3275,12 @@ static void ohci1394_pci_remove(struct pci_dev *pdev)
free_dma_trm_ctx(&ohci->at_resp_context); free_dma_trm_ctx(&ohci->at_resp_context);
case OHCI_INIT_HAVE_SELFID_BUFFER: case OHCI_INIT_HAVE_SELFID_BUFFER:
pci_free_consistent(ohci->dev, OHCI1394_SI_DMA_BUF_SIZE, pci_free_consistent(dev, OHCI1394_SI_DMA_BUF_SIZE,
ohci->selfid_buf_cpu, ohci->selfid_buf_cpu,
ohci->selfid_buf_bus); ohci->selfid_buf_bus);
case OHCI_INIT_HAVE_CONFIG_ROM_BUFFER: case OHCI_INIT_HAVE_CONFIG_ROM_BUFFER:
pci_free_consistent(ohci->dev, OHCI_CONFIG_ROM_LEN, pci_free_consistent(dev, OHCI_CONFIG_ROM_LEN,
ohci->csr_config_rom_cpu, ohci->csr_config_rom_cpu,
ohci->csr_config_rom_bus); ohci->csr_config_rom_bus);
@@ -3270,35 +3288,24 @@ static void ohci1394_pci_remove(struct pci_dev *pdev)
iounmap(ohci->registers); iounmap(ohci->registers);
case OHCI_INIT_HAVE_MEM_REGION: case OHCI_INIT_HAVE_MEM_REGION:
release_mem_region(pci_resource_start(ohci->dev, 0), release_mem_region(pci_resource_start(dev, 0),
OHCI1394_REGISTER_SIZE); OHCI1394_REGISTER_SIZE);
#ifdef CONFIG_PPC_PMAC ohci1394_pmac_off(dev);
/* 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(ohci->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 */
case OHCI_INIT_ALLOC_HOST: case OHCI_INIT_ALLOC_HOST:
pci_set_drvdata(ohci->dev, NULL); pci_set_drvdata(dev, NULL);
} }
if (dev) if (device)
put_device(dev); put_device(device);
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int ohci1394_pci_suspend(struct pci_dev *pdev, pm_message_t state) static int ohci1394_pci_suspend(struct pci_dev *dev, pm_message_t state)
{ {
int err; int err;
struct ti_ohci *ohci = pci_get_drvdata(pdev); struct ti_ohci *ohci = pci_get_drvdata(dev);
if (!ohci) { if (!ohci) {
printk(KERN_ERR "%s: tried to suspend nonexisting host\n", printk(KERN_ERR "%s: tried to suspend nonexisting host\n",
@@ -3326,34 +3333,23 @@ static int ohci1394_pci_suspend(struct pci_dev *pdev, pm_message_t state)
ohci_devctl(ohci->host, RESET_BUS, LONG_RESET_NO_FORCE_ROOT); ohci_devctl(ohci->host, RESET_BUS, LONG_RESET_NO_FORCE_ROOT);
ohci_soft_reset(ohci); ohci_soft_reset(ohci);
err = pci_save_state(pdev); err = pci_save_state(dev);
if (err) { if (err) {
PRINT(KERN_ERR, "pci_save_state failed with %d", err); PRINT(KERN_ERR, "pci_save_state failed with %d", err);
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)
DBGMSG("pci_set_power_state failed with %d", err); DBGMSG("pci_set_power_state failed with %d", err);
ohci1394_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 ohci1394_pci_resume(struct pci_dev *pdev) static int ohci1394_pci_resume(struct pci_dev *dev)
{ {
int err; int err;
struct ti_ohci *ohci = pci_get_drvdata(pdev); struct ti_ohci *ohci = pci_get_drvdata(dev);
if (!ohci) { if (!ohci) {
printk(KERN_ERR "%s: tried to resume nonexisting host\n", printk(KERN_ERR "%s: tried to resume nonexisting host\n",
@@ -3362,21 +3358,10 @@ static int ohci1394_pci_resume(struct pci_dev *pdev)
} }
DBGMSG("resume called"); DBGMSG("resume called");
/* PowerMac resume code comes first */ ohci1394_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) {
PRINT(KERN_ERR, "pci_enable_device failed with %d", err); PRINT(KERN_ERR, "pci_enable_device failed with %d", err);
return err; return err;