5 files changed, 29 insertions, 29 deletions

diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c
index dea2dcc9310d..1c4980c32f90 100644
--- a/drivers/firewire/core-transaction.c
+++ b/drivers/firewire/core-transaction.c
@@ -994,6 +994,32 @@ void fw_core_handle_response(struct fw_card *card, struct fw_packet *p)
 }
 EXPORT_SYMBOL(fw_core_handle_response);
 
+/**
+ * fw_rcode_string - convert a firewire result code to an error description
+ * @rcode: the result code
+ */
+const char *fw_rcode_string(int rcode)
+{
+        static const char *const names[] = {
+                [RCODE_COMPLETE]       = "no error",
+                [RCODE_CONFLICT_ERROR] = "conflict error",
+                [RCODE_DATA_ERROR]     = "data error",
+                [RCODE_TYPE_ERROR]     = "type error",
+                [RCODE_ADDRESS_ERROR]  = "address error",
+                [RCODE_SEND_ERROR]     = "send error",
+                [RCODE_CANCELLED]      = "timeout",
+                [RCODE_BUSY]           = "busy",
+                [RCODE_GENERATION]     = "bus reset",
+                [RCODE_NO_ACK]         = "no ack",
+        };
+
+        if ((unsigned int)rcode < ARRAY_SIZE(names) && names[rcode])
+                return names[rcode];
+        else
+                return "unknown";
+}
+EXPORT_SYMBOL(fw_rcode_string);
+
 static const struct fw_address_region topology_map_region =
         { .start = CSR_REGISTER_BASE | CSR_TOPOLOGY_MAP,
           .end   = CSR_REGISTER_BASE | CSR_TOPOLOGY_MAP_END, };
diff --git a/include/linux/firewire.h b/include/linux/firewire.h
index 0a1905719f6f..584826ba2eb7 100644
--- a/include/linux/firewire.h
+++ b/include/linux/firewire.h
@@ -334,6 +334,7 @@ int fw_cancel_transaction(struct fw_card *card,
 int fw_run_transaction(struct fw_card *card, int tcode, int destination_id,
                        int generation, int speed, unsigned long long offset,
                        void *payload, size_t length);
+const char *fw_rcode_string(int rcode);
 
 static inline int fw_stream_packet_destination_id(int tag, int channel, int sy)
 {
diff --git a/sound/firewire/cmp.c b/sound/firewire/cmp.c
index 76294f2ae47f..645cb0ba4293 100644
--- a/sound/firewire/cmp.c
+++ b/sound/firewire/cmp.c
@@ -84,7 +84,7 @@ static int pcr_modify(struct cmp_connection *c,
         return 0;
 
 io_error:
-        cmp_error(c, "transaction failed: %s\n", rcode_string(rcode));
+        cmp_error(c, "transaction failed: %s\n", fw_rcode_string(rcode));
         return -EIO;
 
 bus_reset:
diff --git a/sound/firewire/lib.c b/sound/firewire/lib.c
index 4750cea2210e..14eb41498372 100644
--- a/sound/firewire/lib.c
+++ b/sound/firewire/lib.c
@@ -14,32 +14,6 @@
 #define ERROR_RETRY_DELAY_MS    5
 
 /**
- * rcode_string - convert a firewire result code to a string
- * @rcode: the result
- */
-const char *rcode_string(unsigned int rcode)
-{
-        static const char *const names[] = {
-                [RCODE_COMPLETE]        = "complete",
-                [RCODE_CONFLICT_ERROR]  = "conflict error",
-                [RCODE_DATA_ERROR]      = "data error",
-                [RCODE_TYPE_ERROR]      = "type error",
-                [RCODE_ADDRESS_ERROR]   = "address error",
-                [RCODE_SEND_ERROR]      = "send error",
-                [RCODE_CANCELLED]       = "cancelled",
-                [RCODE_BUSY]            = "busy",
-                [RCODE_GENERATION]      = "generation",
-                [RCODE_NO_ACK]          = "no ack",
-        };
-
-        if (rcode < ARRAY_SIZE(names) && names[rcode])
-                return names[rcode];
-        else
-                return "unknown";
-}
-EXPORT_SYMBOL(rcode_string);
-
-/**
  * snd_fw_transaction - send a request and wait for its completion
  * @unit: the driver's unit on the target device
  * @tcode: the transaction code
@@ -71,7 +45,7 @@ int snd_fw_transaction(struct fw_unit *unit, int tcode,
 
                 if (rcode_is_permanent_error(rcode) || ++tries >= 3) {
                         dev_err(&unit->device, "transaction failed: %s\n",
-                                rcode_string(rcode));
+                                fw_rcode_string(rcode));
                         return -EIO;
                 }
 
diff --git a/sound/firewire/lib.h b/sound/firewire/lib.h
index 064f3fd9ab06..aef301476ea9 100644
--- a/sound/firewire/lib.h
+++ b/sound/firewire/lib.h
@@ -8,7 +8,6 @@ struct fw_unit;
 
 int snd_fw_transaction(struct fw_unit *unit, int tcode,
                        u64 offset, void *buffer, size_t length);
-const char *rcode_string(unsigned int rcode);
 
 /* returns true if retrying the transaction would not make sense */
 static inline bool rcode_is_permanent_error(int rcode)