firewire: Rename 'send_iso' to 'start_iso'.

[linux-2.6] / drivers / firewire / fw-card.c

diff --git a/drivers/firewire/fw-card.c b/drivers/firewire/fw-card.c
index 7f5dc43ec131e658bf41e0d7fc033631d261d967..3f8661a52acce16af5e49e1876325d245051ef3e 100644 (file)
--- a/drivers/firewire/fw-card.c
+++ b/drivers/firewire/fw-card.c
@@ -367,9 +367,9 @@ void
 fw_card_initialize(struct fw_card *card, const struct fw_card_driver *driver,
                   struct device *device)
 {
-       static int index;
+       static atomic_t index = ATOMIC_INIT(-1);
 
-       card->index = index++;
+       card->index = atomic_inc_return(&index);
        card->driver = driver;
        card->device = device;
        card->current_tlabel = 0;
@@ -474,6 +474,12 @@ dummy_send_response(struct fw_card *card, struct fw_packet *packet)
        packet->callback(packet, card, -ENODEV);
 }
 
+static int
+dummy_cancel_packet(struct fw_card *card, struct fw_packet *packet)
+{
+       return -ENOENT;
+}
+
 static int
 dummy_enable_phys_dma(struct fw_card *card,
                      int node_id, int generation)
@@ -487,6 +493,7 @@ static struct fw_card_driver dummy_driver = {
        .update_phy_reg  = dummy_update_phy_reg,
        .set_config_rom  = dummy_set_config_rom,
        .send_request    = dummy_send_request,
+       .cancel_packet   = dummy_cancel_packet,
        .send_response   = dummy_send_response,
        .enable_phys_dma = dummy_enable_phys_dma,
 };