10 files changed, 142 insertions, 145 deletions

diff --git a/drivers/ieee1394/csr.c b/drivers/ieee1394/csr.c
index 52ac83e0ebee..c90be4070e40 100644
--- a/drivers/ieee1394/csr.c
+++ b/drivers/ieee1394/csr.c
@@ -133,8 +133,7 @@ static void host_reset(struct hpsb_host *host)
                 host->csr.state &= ~0x100;
         }
 
-        host->csr.topology_map[1] =
-                cpu_to_be32(be32_to_cpu(host->csr.topology_map[1]) + 1);
+        be32_add_cpu(&host->csr.topology_map[1], 1);
         host->csr.topology_map[2] = cpu_to_be32(host->node_count << 16
                                                 | host->selfid_count);
         host->csr.topology_map[0] =
@@ -142,8 +141,7 @@ static void host_reset(struct hpsb_host *host)
                             | csr_crc16(host->csr.topology_map + 1,
                                         host->selfid_count + 2));
 
-        host->csr.speed_map[1] =
-                cpu_to_be32(be32_to_cpu(host->csr.speed_map[1]) + 1);
+        be32_add_cpu(&host->csr.speed_map[1], 1);
         host->csr.speed_map[0] = cpu_to_be32(0x3f1 << 16
                                              | csr_crc16(host->csr.speed_map+1,
                                                          0x3f1));
diff --git a/drivers/ieee1394/dv1394.c b/drivers/ieee1394/dv1394.c
index 65722117ab6e..6228fadacd38 100644
--- a/drivers/ieee1394/dv1394.c
+++ b/drivers/ieee1394/dv1394.c
@@ -2179,8 +2179,7 @@ static struct ieee1394_device_id dv1394_id_table[] = {
 MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table);
 
 static struct hpsb_protocol_driver dv1394_driver = {
-        .name           = "dv1394",
-        .id_table       = dv1394_id_table,
+        .name = "dv1394",
 };
 
 
@@ -2568,7 +2567,6 @@ static int __init dv1394_init_module(void)
 
         cdev_init(&dv1394_cdev, &dv1394_fops);
         dv1394_cdev.owner = THIS_MODULE;
-        kobject_set_name(&dv1394_cdev.kobj, "dv1394");
         ret = cdev_add(&dv1394_cdev, IEEE1394_DV1394_DEV, 16);
         if (ret) {
                 printk(KERN_ERR "dv1394: unable to register character device\n");
diff --git a/drivers/ieee1394/highlevel.c b/drivers/ieee1394/highlevel.c
index b6425469b6ee..fa2bfec0fca2 100644
--- a/drivers/ieee1394/highlevel.c
+++ b/drivers/ieee1394/highlevel.c
@@ -339,7 +339,7 @@ u64 hpsb_allocate_and_register_addrspace(struct hpsb_highlevel *hl,
         if ((alignment & 3) || (alignment > 0x800000000000ULL) ||
             (hweight64(alignment) != 1)) {
                 HPSB_ERR("%s called with invalid alignment: 0x%048llx",
-                         __FUNCTION__, (unsigned long long)alignment);
+                         __func__, (unsigned long long)alignment);
                 return retval;
         }
 
@@ -354,7 +354,7 @@ u64 hpsb_allocate_and_register_addrspace(struct hpsb_highlevel *hl,
         if (((start|end) & ~align_mask) || (start >= end) ||
             (end > CSR1212_ALL_SPACE_END)) {
                 HPSB_ERR("%s called with invalid addresses "
-                         "(start = %012Lx  end = %012Lx)", __FUNCTION__,
+                         "(start = %012Lx  end = %012Lx)", __func__,
                          (unsigned long long)start,(unsigned long long)end);
                 return retval;
         }
@@ -422,7 +422,7 @@ int hpsb_register_addrspace(struct hpsb_highlevel *hl, struct hpsb_host *host,
 
         if (((start|end) & 3) || (start >= end) ||
             (end > CSR1212_ALL_SPACE_END)) {
-                HPSB_ERR("%s called with invalid addresses", __FUNCTION__);
+                HPSB_ERR("%s called with invalid addresses", __func__);
                 return 0;
         }
 
diff --git a/drivers/ieee1394/ieee1394_core.c b/drivers/ieee1394/ieee1394_core.c
index 36c747b277d0..dcdb71a7718d 100644
--- a/drivers/ieee1394/ieee1394_core.c
+++ b/drivers/ieee1394/ieee1394_core.c
@@ -242,7 +242,7 @@ int hpsb_bus_reset(struct hpsb_host *host)
 {
         if (host->in_bus_reset) {
                 HPSB_NOTICE("%s called while bus reset already in progress",
-                            __FUNCTION__);
+                            __func__);
                 return 1;
         }
 
@@ -373,6 +373,8 @@ static void build_speed_map(struct hpsb_host *host, int nodecount)
                         if (sid->port2 == SELFID_PORT_CHILD) cldcnt[n]++;
 
                         speedcap[n] = sid->speed;
+                        if (speedcap[n] > host->csr.lnk_spd)
+                                speedcap[n] = host->csr.lnk_spd;
                         n--;
                 }
         }
diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c
index 511e4321c6b6..70afa3786f3f 100644
--- a/drivers/ieee1394/nodemgr.c
+++ b/drivers/ieee1394/nodemgr.c
@@ -701,7 +701,11 @@ static int nodemgr_bus_match(struct device * dev, struct device_driver * drv)
                 return 0;
 
         driver = container_of(drv, struct hpsb_protocol_driver, driver);
-        for (id = driver->id_table; id->match_flags != 0; id++) {
+        id = driver->id_table;
+        if (!id)
+                return 0;
+
+        for (; id->match_flags != 0; id++) {
                 if ((id->match_flags & IEEE1394_MATCH_VENDOR_ID) &&
                     id->vendor_id != ud->vendor_id)
                         continue;
diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c
index 969de2a2d633..0690469fcecf 100644
--- a/drivers/ieee1394/ohci1394.c
+++ b/drivers/ieee1394/ohci1394.c
@@ -149,7 +149,7 @@ printk(level "%s: fw-host%d: " fmt "\n" , OHCI1394_DRIVER_NAME, ohci->host->id ,
 /* Module Parameters */
 static int phys_dma = 1;
 module_param(phys_dma, int, 0444);
-MODULE_PARM_DESC(phys_dma, "Enable physical dma (default = 1).");
+MODULE_PARM_DESC(phys_dma, "Enable physical DMA (default = 1).");
 
 static void dma_trm_tasklet(unsigned long data);
 static void dma_trm_reset(struct dma_trm_ctx *d);
@@ -708,7 +708,7 @@ static void insert_packet(struct ti_ohci *ohci,
                                 /* FIXME: do something about it */
                                 PRINT(KERN_ERR,
                                       "%s: packet data addr: %p size %Zd bytes "
-                                      "cross page boundary", __FUNCTION__,
+                                      "cross page boundary", __func__,
                                       packet->data, packet->data_size);
                         }
 #endif
@@ -2089,10 +2089,8 @@ static void dma_trm_reset(struct dma_trm_ctx *d)
 
         spin_lock_irqsave(&d->lock, flags);
 
-        list_splice(&d->fifo_list, &packet_list);
-        list_splice(&d->pending_list, &packet_list);
-        INIT_LIST_HEAD(&d->fifo_list);
-        INIT_LIST_HEAD(&d->pending_list);
+        list_splice_init(&d->fifo_list, &packet_list);
+        list_splice_init(&d->pending_list, &packet_list);
 
         d->branchAddrPtr = NULL;
         d->sent_ind = d->prg_ind;
@@ -2787,7 +2785,7 @@ alloc_dma_rcv_ctx(struct ti_ohci *ohci, struct dma_rcv_ctx *d,
         d->buf_bus = kzalloc(d->num_desc * sizeof(*d->buf_bus), GFP_ATOMIC);
 
         if (d->buf_cpu == NULL || d->buf_bus == NULL) {
-                PRINT(KERN_ERR, "Failed to allocate dma buffer");
+                PRINT(KERN_ERR, "Failed to allocate %s", "DMA buffer");
                 free_dma_rcv_ctx(d);
                 return -ENOMEM;
         }
@@ -2796,7 +2794,7 @@ alloc_dma_rcv_ctx(struct ti_ohci *ohci, struct dma_rcv_ctx *d,
         d->prg_bus = kzalloc(d->num_desc * sizeof(*d->prg_bus), GFP_ATOMIC);
 
         if (d->prg_cpu == NULL || d->prg_bus == NULL) {
-                PRINT(KERN_ERR, "Failed to allocate dma prg");
+                PRINT(KERN_ERR, "Failed to allocate %s", "DMA prg");
                 free_dma_rcv_ctx(d);
                 return -ENOMEM;
         }
@@ -2804,7 +2802,7 @@ alloc_dma_rcv_ctx(struct ti_ohci *ohci, struct dma_rcv_ctx *d,
         d->spb = kmalloc(d->split_buf_size, GFP_ATOMIC);
 
         if (d->spb == NULL) {
-                PRINT(KERN_ERR, "Failed to allocate split buffer");
+                PRINT(KERN_ERR, "Failed to allocate %s", "split buffer");
                 free_dma_rcv_ctx(d);
                 return -ENOMEM;
         }
@@ -2830,7 +2828,7 @@ alloc_dma_rcv_ctx(struct ti_ohci *ohci, struct dma_rcv_ctx *d,
                         memset(d->buf_cpu[i], 0, d->buf_size);
                 } else {
                         PRINT(KERN_ERR,
-                              "Failed to allocate dma buffer");
+                              "Failed to allocate %s", "DMA buffer");
                         free_dma_rcv_ctx(d);
                         return -ENOMEM;
                 }
@@ -2841,7 +2839,7 @@ alloc_dma_rcv_ctx(struct ti_ohci *ohci, struct dma_rcv_ctx *d,
                         memset(d->prg_cpu[i], 0, sizeof(struct dma_cmd));
                 } else {
                         PRINT(KERN_ERR,
-                              "Failed to allocate dma prg");
+                              "Failed to allocate %s", "DMA prg");
                         free_dma_rcv_ctx(d);
                         return -ENOMEM;
                 }
@@ -2902,7 +2900,7 @@ alloc_dma_trm_ctx(struct ti_ohci *ohci, struct dma_trm_ctx *d,
         d->prg_bus = kzalloc(d->num_desc * sizeof(*d->prg_bus), GFP_KERNEL);
 
         if (d->prg_cpu == NULL || d->prg_bus == NULL) {
-                PRINT(KERN_ERR, "Failed to allocate at dma prg");
+                PRINT(KERN_ERR, "Failed to allocate %s", "AT DMA prg");
                 free_dma_trm_ctx(d);
                 return -ENOMEM;
         }
@@ -2925,7 +2923,7 @@ alloc_dma_trm_ctx(struct ti_ohci *ohci, struct dma_trm_ctx *d,
                         memset(d->prg_cpu[i], 0, sizeof(struct at_dma_prg));
                 } else {
                         PRINT(KERN_ERR,
-                              "Failed to allocate at dma prg");
+                              "Failed to allocate %s", "AT DMA prg");
                         free_dma_trm_ctx(d);
                         return -ENOMEM;
                 }
@@ -2986,22 +2984,9 @@ static struct hpsb_host_driver ohci1394_driver = {
  * PCI Driver Interface functions  *
  ***********************************/
 
-#define FAIL(err, fmt, args...)                 \
-do {                                            \
-        PRINT_G(KERN_ERR, fmt , ## args);       \
-        ohci1394_pci_remove(dev);               \
-        return err;                             \
-} 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
-        /* Necessary on some machines if ohci1394 was loaded/ unloaded before */
+static void ohci1394_pmac_on(struct pci_dev *dev)
+{
         if (machine_is(powermac)) {
                 struct device_node *ofn = pci_device_to_OF_node(dev);
 
@@ -3010,15 +2995,45 @@ static int __devinit ohci1394_pci_probe(struct pci_dev *dev,
                         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 */
 
-        if (pci_enable_device(dev))
-                FAIL(-ENXIO, "Failed to enable OHCI hardware");
+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;
+        int err = -ENOMEM;
+
+        ohci1394_pmac_on(dev);
+        if (pci_enable_device(dev)) {
+                PRINT_G(KERN_ERR, "Failed to enable OHCI hardware");
+                err = -ENXIO;
+                goto err;
+        }
         pci_set_master(dev);
 
         host = hpsb_alloc_host(&ohci1394_driver, sizeof(struct ti_ohci), &dev->dev);
-        if (!host) FAIL(-ENOMEM, "Failed to allocate host structure");
-
+        if (!host) {
+                PRINT_G(KERN_ERR, "Failed to allocate %s", "host structure");
+                goto err;
+        }
         ohci = host->hostdata;
         ohci->dev = dev;
         ohci->host = host;
@@ -3067,15 +3082,20 @@ static int __devinit ohci1394_pci_probe(struct pci_dev *dev,
                       (unsigned long long)pci_resource_len(dev, 0));
 
         if (!request_mem_region(ohci_base, OHCI1394_REGISTER_SIZE,
-                                OHCI1394_DRIVER_NAME))
-                FAIL(-ENOMEM, "MMIO resource (0x%llx - 0x%llx) unavailable",
+                                OHCI1394_DRIVER_NAME)) {
+                PRINT_G(KERN_ERR, "MMIO resource (0x%llx - 0x%llx) unavailable",
                         (unsigned long long)ohci_base,
                         (unsigned long long)ohci_base + OHCI1394_REGISTER_SIZE);
+                goto err;
+        }
         ohci->init_state = OHCI_INIT_HAVE_MEM_REGION;
 
         ohci->registers = ioremap(ohci_base, OHCI1394_REGISTER_SIZE);
-        if (ohci->registers == NULL)
-                FAIL(-ENXIO, "Failed to remap registers - card not accessible");
+        if (ohci->registers == NULL) {
+                PRINT_G(KERN_ERR, "Failed to remap registers");
+                err = -ENXIO;
+                goto err;
+        }
         ohci->init_state = OHCI_INIT_HAVE_IOMAPPING;
         DBGMSG("Remapped memory spaces reg 0x%p", ohci->registers);
 
@@ -3083,16 +3103,20 @@ static int __devinit ohci1394_pci_probe(struct pci_dev *dev,
         ohci->csr_config_rom_cpu =
                 pci_alloc_consistent(ohci->dev, OHCI_CONFIG_ROM_LEN,
                                      &ohci->csr_config_rom_bus);
-        if (ohci->csr_config_rom_cpu == NULL)
-                FAIL(-ENOMEM, "Failed to allocate buffer config rom");
+        if (ohci->csr_config_rom_cpu == NULL) {
+                PRINT_G(KERN_ERR, "Failed to allocate %s", "buffer config rom");
+                goto err;
+        }
         ohci->init_state = OHCI_INIT_HAVE_CONFIG_ROM_BUFFER;
 
         /* self-id dma buffer allocation */
         ohci->selfid_buf_cpu =
                 pci_alloc_consistent(ohci->dev, OHCI1394_SI_DMA_BUF_SIZE,
                       &ohci->selfid_buf_bus);
-        if (ohci->selfid_buf_cpu == NULL)
-                FAIL(-ENOMEM, "Failed to allocate DMA buffer for self-id packets");
+        if (ohci->selfid_buf_cpu == NULL) {
+                PRINT_G(KERN_ERR, "Failed to allocate %s", "self-ID buffer");
+                goto err;
+        }
         ohci->init_state = OHCI_INIT_HAVE_SELFID_BUFFER;
 
         if ((unsigned long)ohci->selfid_buf_cpu & 0x1fff)
@@ -3108,28 +3132,32 @@ static int __devinit ohci1394_pci_probe(struct pci_dev *dev,
         if (alloc_dma_rcv_ctx(ohci, &ohci->ar_req_context,
                               DMA_CTX_ASYNC_REQ, 0, AR_REQ_NUM_DESC,
                               AR_REQ_BUF_SIZE, AR_REQ_SPLIT_BUF_SIZE,
-                              OHCI1394_AsReqRcvContextBase) < 0)
-                FAIL(-ENOMEM, "Failed to allocate AR Req context");
-
+                              OHCI1394_AsReqRcvContextBase) < 0) {
+                PRINT_G(KERN_ERR, "Failed to allocate %s", "AR Req context");
+                goto err;
+        }
         /* AR DMA response context allocation */
         if (alloc_dma_rcv_ctx(ohci, &ohci->ar_resp_context,
                               DMA_CTX_ASYNC_RESP, 0, AR_RESP_NUM_DESC,
                               AR_RESP_BUF_SIZE, AR_RESP_SPLIT_BUF_SIZE,
-                              OHCI1394_AsRspRcvContextBase) < 0)
-                FAIL(-ENOMEM, "Failed to allocate AR Resp context");
-
+                              OHCI1394_AsRspRcvContextBase) < 0) {
+                PRINT_G(KERN_ERR, "Failed to allocate %s", "AR Resp context");
+                goto err;
+        }
         /* AT DMA request context */
         if (alloc_dma_trm_ctx(ohci, &ohci->at_req_context,
                               DMA_CTX_ASYNC_REQ, 0, AT_REQ_NUM_DESC,
-                              OHCI1394_AsReqTrContextBase) < 0)
-                FAIL(-ENOMEM, "Failed to allocate AT Req context");
-
+                              OHCI1394_AsReqTrContextBase) < 0) {
+                PRINT_G(KERN_ERR, "Failed to allocate %s", "AT Req context");
+                goto err;
+        }
         /* AT DMA response context */
         if (alloc_dma_trm_ctx(ohci, &ohci->at_resp_context,
                               DMA_CTX_ASYNC_RESP, 1, AT_RESP_NUM_DESC,
-                              OHCI1394_AsRspTrContextBase) < 0)
-                FAIL(-ENOMEM, "Failed to allocate AT Resp context");
-
+                              OHCI1394_AsRspTrContextBase) < 0) {
+                PRINT_G(KERN_ERR, "Failed to allocate %s", "AT Resp context");
+                goto err;
+        }
         /* Start off with a soft reset, to clear everything to a sane
          * state. */
         ohci_soft_reset(ohci);
@@ -3172,9 +3200,10 @@ static int __devinit ohci1394_pci_probe(struct pci_dev *dev,
          * by that point.
          */
         if (request_irq(dev->irq, ohci_irq_handler, IRQF_SHARED,
-                         OHCI1394_DRIVER_NAME, ohci))
-                FAIL(-ENOMEM, "Failed to allocate shared interrupt %d", dev->irq);
-
+                         OHCI1394_DRIVER_NAME, ohci)) {
+                PRINT_G(KERN_ERR, "Failed to allocate interrupt %d", dev->irq);
+                goto err;
+        }
         ohci->init_state = OHCI_INIT_HAVE_IRQ;
         ohci_initialize(ohci);
 
@@ -3194,25 +3223,28 @@ static int __devinit ohci1394_pci_probe(struct pci_dev *dev,
         host->middle_addr_space = OHCI1394_MIDDLE_ADDRESS_SPACE;
 
         /* Tell the highlevel this host is ready */
-        if (hpsb_add_host(host))
-                FAIL(-ENOMEM, "Failed to register host with highlevel");
-
+        if (hpsb_add_host(host)) {
+                PRINT_G(KERN_ERR, "Failed to register host with highlevel");
+                goto err;
+        }
         ohci->init_state = OHCI_INIT_DONE;
 
         return 0;
-#undef FAIL
+err:
+        ohci1394_pci_remove(dev);
+        return err;
 }
 
-static void ohci1394_pci_remove(struct pci_dev *pdev)
+static void ohci1394_pci_remove(struct pci_dev *dev)
 {
         struct ti_ohci *ohci;
-        struct device *dev;
+        struct device *device;
 
-        ohci = pci_get_drvdata(pdev);
+        ohci = pci_get_drvdata(dev);
         if (!ohci)
-                return;
+                goto out;
 
-        dev = get_device(&ohci->host->device);
+        device = get_device(&ohci->host->device);
 
         switch (ohci->init_state) {
         case OHCI_INIT_DONE:
@@ -3246,7 +3278,7 @@ static void ohci1394_pci_remove(struct pci_dev *pdev)
                 /* Soft reset before we start - this disables
                  * interrupts and clears linkEnable and LPS. */
                 ohci_soft_reset(ohci);
-                free_irq(ohci->dev->irq, ohci);
+                free_irq(dev->irq, ohci);
 
         case OHCI_INIT_HAVE_TXRX_BUFFERS__MAYBE:
                 /* The ohci_soft_reset() stops all DMA contexts, so we
@@ -3257,12 +3289,12 @@ static void ohci1394_pci_remove(struct pci_dev *pdev)
                 free_dma_trm_ctx(&ohci->at_resp_context);
 
         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_bus);
 
         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_bus);
 
@@ -3270,35 +3302,24 @@ static void ohci1394_pci_remove(struct pci_dev *pdev)
                 iounmap(ohci->registers);
 
         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);
 
-#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(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:
-                pci_set_drvdata(ohci->dev, NULL);
+                pci_set_drvdata(dev, NULL);
         }
 
-        if (dev)
-                put_device(dev);
+        if (device)
+                put_device(device);
+out:
+        ohci1394_pmac_off(dev);
 }
 
 #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;
-        struct ti_ohci *ohci = pci_get_drvdata(pdev);
+        struct ti_ohci *ohci = pci_get_drvdata(dev);
 
         if (!ohci) {
                 printk(KERN_ERR "%s: tried to suspend nonexisting host\n",
@@ -3326,32 +3347,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_soft_reset(ohci);
 
-        err = pci_save_state(pdev);
+        err = pci_save_state(dev);
         if (err) {
                 PRINT(KERN_ERR, "pci_save_state failed with %d", 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)
                 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 *ofn = pci_device_to_OF_node(pdev);
-
-                if (ofn)
-                        pmac_call_feature(PMAC_FTR_1394_ENABLE, ofn, 0, 0);
-        }
-#endif /* CONFIG_PPC_PMAC */
+        ohci1394_pmac_off(dev);
 
         return 0;
 }
 
-static int ohci1394_pci_resume(struct pci_dev *pdev)
+static int ohci1394_pci_resume(struct pci_dev *dev)
 {
         int err;
-        struct ti_ohci *ohci = pci_get_drvdata(pdev);
+        struct ti_ohci *ohci = pci_get_drvdata(dev);
 
         if (!ohci) {
                 printk(KERN_ERR "%s: tried to resume nonexisting host\n",
@@ -3360,19 +3372,10 @@ static int ohci1394_pci_resume(struct pci_dev *pdev)
         }
         DBGMSG("resume called");
 
-/* PowerMac resume code comes first */
-#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, 1);
-        }
-#endif /* CONFIG_PPC_PMAC */
-
-        pci_set_power_state(pdev, PCI_D0);
-        pci_restore_state(pdev);
-        err = pci_enable_device(pdev);
+        ohci1394_pmac_on(dev);
+        pci_set_power_state(dev, PCI_D0);
+        pci_restore_state(dev);
+        err = pci_enable_device(dev);
         if (err) {
                 PRINT(KERN_ERR, "pci_enable_device failed with %d", err);
                 return err;
diff --git a/drivers/ieee1394/pcilynx.c b/drivers/ieee1394/pcilynx.c
index 8af01ab30cc9..7aee1ac97c80 100644
--- a/drivers/ieee1394/pcilynx.c
+++ b/drivers/ieee1394/pcilynx.c
@@ -226,7 +226,7 @@ static int get_phy_reg(struct ti_lynx *lynx, int addr)
         if (addr > 15) {
                 PRINT(KERN_ERR, lynx->id,
                       "%s: PHY register address %d out of range",
-                      __FUNCTION__, addr);
+                      __func__, addr);
                 return -1;
         }
 
@@ -238,7 +238,7 @@ static int get_phy_reg(struct ti_lynx *lynx, int addr)
 
                 if (i > 10000) {
                         PRINT(KERN_ERR, lynx->id, "%s: runaway loop, aborting",
-                              __FUNCTION__);
+                              __func__);
                         retval = -1;
                         break;
                 }
@@ -261,13 +261,13 @@ static int set_phy_reg(struct ti_lynx *lynx, int addr, int val)
 
         if (addr > 15) {
                 PRINT(KERN_ERR, lynx->id,
-                      "%s: PHY register address %d out of range", __FUNCTION__, addr);
+                      "%s: PHY register address %d out of range", __func__, addr);
                 return -1;
         }
 
         if (val > 0xff) {
                 PRINT(KERN_ERR, lynx->id,
-                      "%s: PHY register value %d out of range", __FUNCTION__, val);
+                      "%s: PHY register value %d out of range", __func__, val);
                 return -1;
         }
 
@@ -287,7 +287,7 @@ static int sel_phy_reg_page(struct ti_lynx *lynx, int page)
 
         if (page > 7) {
                 PRINT(KERN_ERR, lynx->id,
-                      "%s: PHY page %d out of range", __FUNCTION__, page);
+                      "%s: PHY page %d out of range", __func__, page);
                 return -1;
         }
 
@@ -309,7 +309,7 @@ static int sel_phy_reg_port(struct ti_lynx *lynx, int port)
 
         if (port > 15) {
                 PRINT(KERN_ERR, lynx->id,
-                      "%s: PHY port %d out of range", __FUNCTION__, port);
+                      "%s: PHY port %d out of range", __func__, port);
                 return -1;
         }
 
@@ -738,8 +738,7 @@ static int lynx_devctl(struct hpsb_host *host, enum devctl_cmd cmd, int arg)
                 spin_lock_irqsave(&lynx->async.queue_lock, flags);
 
                 reg_write(lynx, DMA_CHAN_CTRL(CHANNEL_ASYNC_SEND), 0);
-                list_splice(&lynx->async.queue, &packet_list);
-                INIT_LIST_HEAD(&lynx->async.queue);
+                list_splice_init(&lynx->async.queue, &packet_list);
 
                 if (list_empty(&lynx->async.pcl_queue)) {
                         spin_unlock_irqrestore(&lynx->async.queue_lock, flags);
diff --git a/drivers/ieee1394/raw1394.c b/drivers/ieee1394/raw1394.c
index 37e7e109af38..04e96ba56e09 100644
--- a/drivers/ieee1394/raw1394.c
+++ b/drivers/ieee1394/raw1394.c
@@ -2959,7 +2959,6 @@ MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table);
 
 static struct hpsb_protocol_driver raw1394_driver = {
         .name = "raw1394",
-        .id_table = raw1394_id_table,
 };
 
 /******************************************************************************/
@@ -3004,7 +3003,6 @@ static int __init init_raw1394(void)
 
         cdev_init(&raw1394_cdev, &raw1394_fops);
         raw1394_cdev.owner = THIS_MODULE;
-        kobject_set_name(&raw1394_cdev.kobj, RAW1394_DEVICE_NAME);
         ret = cdev_add(&raw1394_cdev, IEEE1394_RAW1394_DEV, 1);
         if (ret) {
                 HPSB_ERR("raw1394 failed to register minor device block");
diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c
index f53f72daae34..16b9d0ad154e 100644
--- a/drivers/ieee1394/sbp2.c
+++ b/drivers/ieee1394/sbp2.c
@@ -615,7 +615,7 @@ static struct sbp2_command_info *sbp2util_allocate_command_orb(
                 cmd->Current_SCpnt = Current_SCpnt;
                 list_add_tail(&cmd->list, &lu->cmd_orb_inuse);
         } else
-                SBP2_ERR("%s: no orbs available", __FUNCTION__);
+                SBP2_ERR("%s: no orbs available", __func__);
         spin_unlock_irqrestore(&lu->cmd_orb_lock, flags);
         return cmd;
 }
@@ -1294,7 +1294,7 @@ static int sbp2_set_busy_timeout(struct sbp2_lu *lu)
 
         data = cpu_to_be32(SBP2_BUSY_TIMEOUT_VALUE);
         if (hpsb_node_write(lu->ne, SBP2_BUSY_TIMEOUT_ADDRESS, &data, 4))
-                SBP2_ERR("%s error", __FUNCTION__);
+                SBP2_ERR("%s error", __func__);
         return 0;
 }
 
@@ -1985,11 +1985,8 @@ static int sbp2scsi_slave_alloc(struct scsi_device *sdev)
         lu->sdev = sdev;
         sdev->allow_restart = 1;
 
-        /*
-         * Update the dma alignment (minimum alignment requirements for
-         * start and end of DMA transfers) to be a sector
-         */
-        blk_queue_update_dma_alignment(sdev->request_queue, 511);
+        /* SBP-2 requires quadlet alignment of the data buffers. */
+        blk_queue_update_dma_alignment(sdev->request_queue, 4 - 1);
 
         if (lu->workarounds & SBP2_WORKAROUND_INQUIRY_36)
                 sdev->inquiry_len = 36;
diff --git a/drivers/ieee1394/video1394.c b/drivers/ieee1394/video1394.c
index bd28adfd7afc..e03024eeeac1 100644
--- a/drivers/ieee1394/video1394.c
+++ b/drivers/ieee1394/video1394.c
@@ -1315,8 +1315,7 @@ static struct ieee1394_device_id video1394_id_table[] = {
 MODULE_DEVICE_TABLE(ieee1394, video1394_id_table);
 
 static struct hpsb_protocol_driver video1394_driver = {
-        .name           = VIDEO1394_DRIVER_NAME,
-        .id_table       = video1394_id_table,
+        .name = VIDEO1394_DRIVER_NAME,
 };
 
 
@@ -1504,7 +1503,6 @@ static int __init video1394_init_module (void)
 
         cdev_init(&video1394_cdev, &video1394_fops);
         video1394_cdev.owner = THIS_MODULE;
-        kobject_set_name(&video1394_cdev.kobj, VIDEO1394_DRIVER_NAME);
         ret = cdev_add(&video1394_cdev, IEEE1394_VIDEO1394_DEV, 16);
         if (ret) {
                 PRINT_G(KERN_ERR, "video1394: unable to get minor device block");