1 files changed, 28 insertions, 6 deletions

diff --git a/drivers/firewire/core-card.c b/drivers/firewire/core-card.c
index 85661b060ed7..cc595eba7ba9 100644
--- a/drivers/firewire/core-card.c
+++ b/drivers/firewire/core-card.c
@@ -37,6 +37,22 @@
 
 #include "core.h"
 
+#define define_fw_printk_level(func, kern_level)                \
+void func(const struct fw_card *card, const char *fmt, ...)     \
+{                                                               \
+        struct va_format vaf;                                   \
+        va_list args;                                           \
+                                                                \
+        va_start(args, fmt);                                    \
+        vaf.fmt = fmt;                                          \
+        vaf.va = &args;                                         \
+        printk(kern_level KBUILD_MODNAME " %s: %pV",            \
+               dev_name(card->device), &vaf);                   \
+        va_end(args);                                           \
+}
+define_fw_printk_level(fw_err, KERN_ERR);
+define_fw_printk_level(fw_notice, KERN_NOTICE);
+
 int fw_compute_block_crc(__be32 *block)
 {
         int length;
@@ -260,7 +276,7 @@ static void allocate_broadcast_channel(struct fw_card *card, int generation)
                 fw_iso_resource_manage(card, generation, 1ULL << 31,
                                        &channel, &bandwidth, true);
                 if (channel != 31) {
-                        fw_notify("failed to allocate broadcast channel\n");
+                        fw_notice(card, "failed to allocate broadcast channel\n");
                         return;
                 }
                 card->broadcast_channel_allocated = true;
@@ -343,14 +359,14 @@ static void bm_work(struct work_struct *work)
 
                 if (!card->irm_node->link_on) {
                         new_root_id = local_id;
-                        fw_notify("%s, making local node (%02x) root.\n",
+                        fw_notice(card, "%s, making local node (%02x) root\n",
                                   "IRM has link off", new_root_id);
                         goto pick_me;
                 }
 
                 if (irm_is_1394_1995_only && !keep_this_irm) {
                         new_root_id = local_id;
-                        fw_notify("%s, making local node (%02x) root.\n",
+                        fw_notice(card, "%s, making local node (%02x) root\n",
                                   "IRM is not 1394a compliant", new_root_id);
                         goto pick_me;
                 }
@@ -405,7 +421,7 @@ static void bm_work(struct work_struct *work)
                          * root, and thus, IRM.
                          */
                         new_root_id = local_id;
-                        fw_notify("%s, making local node (%02x) root.\n",
+                        fw_notice(card, "%s, making local node (%02x) root\n",
                                   "BM lock failed", new_root_id);
                         goto pick_me;
                 }
@@ -478,8 +494,8 @@ static void bm_work(struct work_struct *work)
         spin_unlock_irq(&card->lock);
 
         if (do_reset) {
-                fw_notify("phy config: card %d, new root=%x, gap_count=%d\n",
-                          card->index, new_root_id, gap_count);
+                fw_notice(card, "phy config: new root=%x, gap_count=%d\n",
+                          new_root_id, gap_count);
                 fw_send_phy_config(card, new_root_id, generation, gap_count);
                 reset_bus(card, true);
                 /* Will allocate broadcast channel after the reset. */
@@ -634,6 +650,11 @@ static void dummy_flush_queue_iso(struct fw_iso_context *ctx)
 {
 }
 
+static int dummy_flush_iso_completions(struct fw_iso_context *ctx)
+{
+        return -ENODEV;
+}
+
 static const struct fw_card_driver dummy_driver_template = {
         .read_phy_reg           = dummy_read_phy_reg,
         .update_phy_reg         = dummy_update_phy_reg,
@@ -646,6 +667,7 @@ static const struct fw_card_driver dummy_driver_template = {
         .set_iso_channels       = dummy_set_iso_channels,
         .queue_iso              = dummy_queue_iso,
         .flush_queue_iso        = dummy_flush_queue_iso,
+        .flush_iso_completions  = dummy_flush_iso_completions,
 };
 
 void fw_card_release(struct kref *kref)