ieee1394: sbp2: use a better wildcard for blacklist

[linux-2.6] / drivers / ieee1394 / ohci1394.c

diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c
index 44adefd71684fd4bfbe9d8809b4adaa58206d055..380212573fb5ee0c43df58061772c29ccf0d1c53 100644 (file)
--- a/drivers/ieee1394/ohci1394.c
+++ b/drivers/ieee1394/ohci1394.c
@@ -468,7 +468,6 @@ static int get_nb_iso_ctx(struct ti_ohci *ohci, int reg)
 /* Global initialization */
 static void ohci_initialize(struct ti_ohci *ohci)
 {
-       char irq_buf[16];
        quadlet_t buf;
        int num_ports, i;
 
@@ -586,11 +585,10 @@ static void ohci_initialize(struct ti_ohci *ohci)
        reg_write(ohci, OHCI1394_HCControlSet, OHCI1394_HCControl_linkEnable);
 
        buf = reg_read(ohci, OHCI1394_Version);
-       sprintf (irq_buf, "%d", ohci->dev->irq);
-       PRINT(KERN_INFO, "OHCI-1394 %d.%d (PCI): IRQ=[%s]  "
+       PRINT(KERN_INFO, "OHCI-1394 %d.%d (PCI): IRQ=[%d]  "
              "MMIO=[%llx-%llx]  Max Packet=[%d]  IR/IT contexts=[%d/%d]",
              ((((buf) >> 16) & 0xf) + (((buf) >> 20) & 0xf) * 10),
-             ((((buf) >> 4) & 0xf) + ((buf) & 0xf) * 10), irq_buf,
+             ((((buf) >> 4) & 0xf) + ((buf) & 0xf) * 10), ohci->dev->irq,
              (unsigned long long)pci_resource_start(ohci->dev, 0),
              (unsigned long long)pci_resource_start(ohci->dev, 0) + OHCI1394_REGISTER_SIZE - 1,
              ohci->max_packet_size,
@@ -3217,6 +3215,18 @@ static int __devinit ohci1394_pci_probe(struct pci_dev *dev,
        struct ti_ohci *ohci;   /* shortcut to currently handled device */
        resource_size_t ohci_base;
 
+#ifdef CONFIG_PPC_PMAC
+       /* Necessary on some machines if ohci1394 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 */
+
         if (pci_enable_device(dev))
                FAIL(-ENXIO, "Failed to enable OHCI hardware");
         pci_set_master(dev);
@@ -3505,17 +3515,14 @@ static void ohci1394_pci_remove(struct pci_dev *pdev)
 #endif
 
 #ifdef CONFIG_PPC_PMAC
-       /* On UniNorth, power down the cable and turn off the chip
-        * clock when the module is removed to save power on
-        * laptops. Turning it back ON is done by the arch code when
-        * pci_enable_device() is called */
-       {
-               struct device_node* of_node;
+       /* 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);
 
-               of_node = pci_device_to_OF_node(ohci->dev);
-               if (of_node) {
-                       pmac_call_feature(PMAC_FTR_1394_ENABLE, of_node, 0, 0);
-                       pmac_call_feature(PMAC_FTR_1394_CABLE_POWER, of_node, 0, 0);
+               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 */
@@ -3537,9 +3544,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,26 +3572,20 @@ 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
        if (machine_is(powermac)) {
-               struct device_node *of_node;
+               struct device_node *ofn = pci_device_to_OF_node(pdev);
 
-               /* Disable 1394 */
-               of_node = pci_device_to_OF_node (pdev);
-               if (of_node)
-                       pmac_call_feature(PMAC_FTR_1394_ENABLE, of_node, 0, 0);
+               if (ofn)
+                       pmac_call_feature(PMAC_FTR_1394_ENABLE, ofn, 0, 0);
        }
 #endif /* CONFIG_PPC_PMAC */
 
@@ -3593,27 +3597,30 @@ 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
        if (machine_is(powermac)) {
-               struct device_node *of_node;
+               struct device_node *ofn = pci_device_to_OF_node(pdev);
 
-               /* Re-enable 1394 */
-               of_node = pci_device_to_OF_node (pdev);
-               if (of_node)
-                       pmac_call_feature (PMAC_FTR_1394_ENABLE, of_node, 0, 1);
+               if (ofn)
+                       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);
                return err;
+       }
 
        /* See ohci1394_pci_probe() for comments on this sequence */
        ohci_soft_reset(ohci);
@@ -3627,11 +3634,9 @@ static int ohci1394_pci_resume(struct pci_dev *pdev)
 }
 #endif /* CONFIG_PM */
 
-#define PCI_CLASS_FIREWIRE_OHCI     ((PCI_CLASS_SERIAL_FIREWIRE << 8) | 0x10)
-
 static struct pci_device_id ohci1394_pci_tbl[] = {
        {
-               .class =        PCI_CLASS_FIREWIRE_OHCI,
+               .class =        PCI_CLASS_SERIAL_FIREWIRE_OHCI,
                .class_mask =   PCI_ANY_ID,
                .vendor =       PCI_ANY_ID,
                .device =       PCI_ANY_ID,