Merge tag 'pstore-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl...

[cascardo/linux.git] / drivers / firewire / core-transaction.c

diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c
index 855ab3f..dea2dcc 100644 (file)
--- a/drivers/firewire/core-transaction.c
+++ b/drivers/firewire/core-transaction.c
@@ -565,7 +565,6 @@ int fw_core_add_address_handler(struct fw_address_handler *handler,
                                const struct fw_address_region *region)
 {
        struct fw_address_handler *other;
-       unsigned long flags;
        int ret = -EBUSY;
 
        if (region->start & 0xffff000000000003ULL ||
@@ -575,7 +574,7 @@ int fw_core_add_address_handler(struct fw_address_handler *handler,
            handler->length == 0)
                return -EINVAL;
 
-       spin_lock_irqsave(&address_handler_lock, flags);
+       spin_lock_bh(&address_handler_lock);
 
        handler->offset = region->start;
        while (handler->offset + handler->length <= region->end) {
@@ -594,7 +593,7 @@ int fw_core_add_address_handler(struct fw_address_handler *handler,
                }
        }
 
-       spin_unlock_irqrestore(&address_handler_lock, flags);
+       spin_unlock_bh(&address_handler_lock);
 
        return ret;
 }
@@ -602,14 +601,15 @@ EXPORT_SYMBOL(fw_core_add_address_handler);
 
 /**
  * fw_core_remove_address_handler() - unregister an address handler
+ *
+ * When fw_core_remove_address_handler() returns, @handler->callback() is
+ * guaranteed to not run on any CPU anymore.
  */
 void fw_core_remove_address_handler(struct fw_address_handler *handler)
 {
-       unsigned long flags;
-
-       spin_lock_irqsave(&address_handler_lock, flags);
+       spin_lock_bh(&address_handler_lock);
        list_del(&handler->link);
-       spin_unlock_irqrestore(&address_handler_lock, flags);
+       spin_unlock_bh(&address_handler_lock);
 }
 EXPORT_SYMBOL(fw_core_remove_address_handler);
 
@@ -770,7 +770,7 @@ static struct fw_request *allocate_request(struct fw_card *card,
                break;
 
        default:
-               fw_error("ERROR - corrupt request received - %08x %08x %08x\n",
+               fw_notice(card, "ERROR - corrupt request received - %08x %08x %08x\n",
                         p->header[0], p->header[1], p->header[2]);
                return NULL;
        }
@@ -826,7 +826,6 @@ static void handle_exclusive_region_request(struct fw_card *card,
                                            unsigned long long offset)
 {
        struct fw_address_handler *handler;
-       unsigned long flags;
        int tcode, destination, source;
 
        destination = HEADER_GET_DESTINATION(p->header[0]);
@@ -835,27 +834,19 @@ static void handle_exclusive_region_request(struct fw_card *card,
        if (tcode == TCODE_LOCK_REQUEST)
                tcode = 0x10 + HEADER_GET_EXTENDED_TCODE(p->header[3]);
 
-       spin_lock_irqsave(&address_handler_lock, flags);
+       spin_lock_bh(&address_handler_lock);
        handler = lookup_enclosing_address_handler(&address_handler_list,
                                                   offset, request->length);
-       spin_unlock_irqrestore(&address_handler_lock, flags);
-
-       /*
-        * FIXME: lookup the fw_node corresponding to the sender of
-        * this request and pass that to the address handler instead
-        * of the node ID.  We may also want to move the address
-        * allocations to fw_node so we only do this callback if the
-        * upper layers registered it for this node.
-        */
-
-       if (handler == NULL)
-               fw_send_response(card, request, RCODE_ADDRESS_ERROR);
-       else
+       if (handler)
                handler->address_callback(card, request,
                                          tcode, destination, source,
                                          p->generation, offset,
                                          request->data, request->length,
                                          handler->callback_data);
+       spin_unlock_bh(&address_handler_lock);
+
+       if (!handler)
+               fw_send_response(card, request, RCODE_ADDRESS_ERROR);
 }
 
 static void handle_fcp_region_request(struct fw_card *card,
@@ -864,7 +855,6 @@ static void handle_fcp_region_request(struct fw_card *card,
                                      unsigned long long offset)
 {
        struct fw_address_handler *handler;
-       unsigned long flags;
        int tcode, destination, source;
 
        if ((offset != (CSR_REGISTER_BASE | CSR_FCP_COMMAND) &&
@@ -886,7 +876,7 @@ static void handle_fcp_region_request(struct fw_card *card,
                return;
        }
 
-       spin_lock_irqsave(&address_handler_lock, flags);
+       spin_lock_bh(&address_handler_lock);
        list_for_each_entry(handler, &address_handler_list, link) {
                if (is_enclosing_handler(handler, offset, request->length))
                        handler->address_callback(card, NULL, tcode,
@@ -896,7 +886,7 @@ static void handle_fcp_region_request(struct fw_card *card,
                                                  request->length,
                                                  handler->callback_data);
        }
-       spin_unlock_irqrestore(&address_handler_lock, flags);
+       spin_unlock_bh(&address_handler_lock);
 
        fw_send_response(card, request, RCODE_COMPLETE);
 }
@@ -960,7 +950,7 @@ void fw_core_handle_response(struct fw_card *card, struct fw_packet *p)
 
        if (&t->link == &card->transaction_list) {
  timed_out:
-               fw_notify("Unsolicited response (source %x, tlabel %x)\n",
+               fw_notice(card, "unsolicited response (source %x, tlabel %x)\n",
                          source, tlabel);
                return;
        }