ieee1394: merge from Linus

Conflicts: drivers/ieee1394/hosts.c
Patch "lockdep: annotate ieee1394 skb-queue-head locking" was meddling
with patch "ieee1394: fix kerneldoc of hpsb_alloc_host".

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

diff --combined drivers/ieee1394/hosts.c
index 3ed56be,4feead4..59e6f49
--- 1/drivers/ieee1394/hosts.c
--- 2/drivers/ieee1394/hosts.c
+++ b/drivers/ieee1394/hosts.c
@@@ -90,8 -90,6 +90,16 @@@ static int alloc_hostnum_cb(struct hpsb
        return 0;
  }
  
++/*
++ * The pending_packet_queue is special in that it's processed
++ * from hardirq context too (such as hpsb_bus_reset()). Hence
++ * split the lock class from the usual networking skb-head
++ * lock class by using a separate key for it:
++ */
++static struct lock_class_key pending_packet_queue_key;
++
 +static DEFINE_MUTEX(host_num_alloc);
 +
  /**
   * hpsb_alloc_host - allocate a new host controller.
   * @drv: the driver that will manage the host controller
@@@ -107,6 -105,16 +115,6 @@@
   * Return Value: a pointer to the &hpsb_host if successful, %NULL if
   * no memory was available.
   */
 -static DEFINE_MUTEX(host_num_alloc);
 -
 -/*
 - * The pending_packet_queue is special in that it's processed
 - * from hardirq context too (such as hpsb_bus_reset()). Hence
 - * split the lock class from the usual networking skb-head
 - * lock class by using a separate key for it:
 - */
 -static struct lock_class_key pending_packet_queue_key;
 -
  struct hpsb_host *hpsb_alloc_host(struct hpsb_host_driver *drv, size_t extra,
                                  struct device *dev)
  {
@@@ -128,6 -136,8 +136,8 @@@
        h->driver = drv;
  
        skb_queue_head_init(&h->pending_packet_queue);
+       lockdep_set_class(&h->pending_packet_queue.lock,
+                          &pending_packet_queue_key);
        INIT_LIST_HEAD(&h->addr_space);
  
        for (i = 2; i < 16; i++)

diff --combined drivers/ieee1394/ohci1394.c
index 2283005,448df27..baa090d
--- 1/drivers/ieee1394/ohci1394.c
--- 2/drivers/ieee1394/ohci1394.c
+++ b/drivers/ieee1394/ohci1394.c
@@@ -2598,9 -2598,8 +2598,9 @@@ static const int TCODE_SIZE[16] = {20, 
   * Determine the length of a packet in the buffer
   * Optimization suggested by Pascal Drolet <pascal.drolet@informission.ca>
   */
 -static __inline__ int packet_length(struct dma_rcv_ctx *d, int idx, quadlet_t *buf_ptr,
 -                       int offset, unsigned char tcode, int noswap)
 +static inline int packet_length(struct dma_rcv_ctx *d, int idx,
 +                              quadlet_t *buf_ptr, int offset,
 +                              unsigned char tcode, int noswap)
  {
        int length = -1;
  
@@@ -3553,6 -3552,8 +3553,8 @@@ static int ohci1394_pci_resume (struct 
  
  static int ohci1394_pci_suspend (struct pci_dev *pdev, pm_message_t state)
  {
+       pci_save_state(pdev);
+ 
  #ifdef CONFIG_PPC_PMAC
        if (machine_is(powermac)) {
                struct device_node *of_node;
@@@ -3564,8 -3565,6 +3566,6 @@@
        }
  #endif
  
-       pci_save_state(pdev);
- 
        return 0;
  }