Merge branch 'core/locking' into tracing/ftrace

[linux-2.6-omap-h63xx.git] / drivers / ieee1394 / ieee1394_transactions.c

diff --git a/drivers/ieee1394/ieee1394_transactions.c b/drivers/ieee1394/ieee1394_transactions.c
index 677989320951fc394229b74a69b65ef2317eb7c4..675b3135d5f19a78816976b0835deb54468c94af 100644 (file)
--- a/drivers/ieee1394/ieee1394_transactions.c
+++ b/drivers/ieee1394/ieee1394_transactions.c
@@ -501,8 +501,6 @@ int hpsb_read(struct hpsb_host *host, nodeid_t node, unsigned int generation,
        if (length == 0)
                return -EINVAL;
 
-       BUG_ON(in_interrupt()); // We can't be called in an interrupt, yet
-
        packet = hpsb_make_readpacket(host, node, addr, length);
 
        if (!packet) {
@@ -550,8 +548,6 @@ int hpsb_write(struct hpsb_host *host, nodeid_t node, unsigned int generation,
        if (length == 0)
                return -EINVAL;
 
-       BUG_ON(in_interrupt()); // We can't be called in an interrupt, yet
-
        packet = hpsb_make_writepacket(host, node, addr, buffer, length);
 
        if (!packet)
@@ -571,16 +567,12 @@ int hpsb_write(struct hpsb_host *host, nodeid_t node, unsigned int generation,
        return retval;
 }
 
-#if 0
-
 int hpsb_lock(struct hpsb_host *host, nodeid_t node, unsigned int generation,
-             u64 addr, int extcode, quadlet_t * data, quadlet_t arg)
+             u64 addr, int extcode, quadlet_t *data, quadlet_t arg)
 {
        struct hpsb_packet *packet;
        int retval = 0;
 
-       BUG_ON(in_interrupt()); // We can't be called in an interrupt, yet
-
        packet = hpsb_make_lockpacket(host, node, addr, extcode, data, arg);
        if (!packet)
                return -ENOMEM;
@@ -592,49 +584,12 @@ int hpsb_lock(struct hpsb_host *host, nodeid_t node, unsigned int generation,
 
        retval = hpsb_packet_success(packet);
 
-       if (retval == 0) {
+       if (retval == 0)
                *data = packet->data[0];
-       }
 
-      hpsb_lock_fail:
+hpsb_lock_fail:
        hpsb_free_tlabel(packet);
        hpsb_free_packet(packet);
 
        return retval;
 }
-
-int hpsb_send_gasp(struct hpsb_host *host, int channel, unsigned int generation,
-                  quadlet_t * buffer, size_t length, u32 specifier_id,
-                  unsigned int version)
-{
-       struct hpsb_packet *packet;
-       int retval = 0;
-       u16 specifier_id_hi = (specifier_id & 0x00ffff00) >> 8;
-       u8 specifier_id_lo = specifier_id & 0xff;
-
-       HPSB_VERBOSE("Send GASP: channel = %d, length = %Zd", channel, length);
-
-       length += 8;
-
-       packet = hpsb_make_streampacket(host, NULL, length, channel, 3, 0);
-       if (!packet)
-               return -ENOMEM;
-
-       packet->data[0] = cpu_to_be32((host->node_id << 16) | specifier_id_hi);
-       packet->data[1] =
-           cpu_to_be32((specifier_id_lo << 24) | (version & 0x00ffffff));
-
-       memcpy(&(packet->data[2]), buffer, length - 8);
-
-       packet->generation = generation;
-
-       packet->no_waiter = 1;
-
-       retval = hpsb_send_packet(packet);
-       if (retval < 0)
-               hpsb_free_packet(packet);
-
-       return retval;
-}
-
-#endif                         /*  0  */