summaryrefslogtreecommitdiffstats
path: root/sound/firewire/lib.c
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2012-04-11 17:38:10 +0200
committerStefan Richter <stefanr@s5r6.in-berlin.de>2012-04-17 22:54:55 +0200
commit7bdbff6762a573b911e4ee5715779d8ee6a62631 (patch)
tree446701cfe10e48a735997053f279d2e9b11975fd /sound/firewire/lib.c
parentdb7494e2ce616f2e39e877cf9143b7d873701ec6 (diff)
downloadop-kernel-dev-7bdbff6762a573b911e4ee5715779d8ee6a62631.zip
op-kernel-dev-7bdbff6762a573b911e4ee5715779d8ee6a62631.tar.gz
firewire: move rcode_string() to core
There is nothing audio-specific about the rcode_string() helper, so move it from snd-firewire-lib into firewire-core to allow other code to use it. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de> (fixed sound/firewire/cmp.c)
Diffstat (limited to 'sound/firewire/lib.c')
-rw-r--r--sound/firewire/lib.c28
1 files changed, 1 insertions, 27 deletions
diff --git a/sound/firewire/lib.c b/sound/firewire/lib.c
index 4750cea..14eb414 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;
}
OpenPOWER on IntegriCloud