summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sound/firewire/Makefile2
-rw-r--r--sound/firewire/amdtp-stream.c (renamed from sound/firewire/amdtp.c)6
-rw-r--r--sound/firewire/amdtp-stream.h (renamed from sound/firewire/amdtp.h)0
-rw-r--r--sound/firewire/bebob/bebob.h2
-rw-r--r--sound/firewire/dice/dice.h2
-rw-r--r--sound/firewire/fcp.c2
-rw-r--r--sound/firewire/fireworks/fireworks.h2
-rw-r--r--sound/firewire/oxfw/oxfw.h2
8 files changed, 9 insertions, 9 deletions
diff --git a/sound/firewire/Makefile b/sound/firewire/Makefile
index 8b37f084b2ab..102e342ddc38 100644
--- a/sound/firewire/Makefile
+++ b/sound/firewire/Makefile
@@ -1,5 +1,5 @@
snd-firewire-lib-objs := lib.o iso-resources.o packets-buffer.o \
- fcp.o cmp.o amdtp.o
+ fcp.o cmp.o amdtp-stream.o
snd-oxfw-objs := oxfw.o
snd-isight-objs := isight.o
snd-scs1x-objs := scs1x.o
diff --git a/sound/firewire/amdtp.c b/sound/firewire/amdtp-stream.c
index b251f4b2b51c..ec65ebf8f04a 100644
--- a/sound/firewire/amdtp.c
+++ b/sound/firewire/amdtp-stream.c
@@ -15,7 +15,7 @@
#include <sound/pcm.h>
#include <sound/pcm_params.h>
#include <sound/rawmidi.h>
-#include "amdtp.h"
+#include "amdtp-stream.h"
#define TICKS_PER_CYCLE 3072
#define CYCLES_PER_SECOND 8000
@@ -210,8 +210,8 @@ int amdtp_stream_set_parameters(struct amdtp_stream *s,
midi_channels = DIV_ROUND_UP(midi_ports, 8);
- if (WARN_ON(amdtp_stream_running(s)) |
- WARN_ON(pcm_channels > AMDTP_MAX_CHANNELS_FOR_PCM) |
+ if (WARN_ON(amdtp_stream_running(s)) ||
+ WARN_ON(pcm_channels > AMDTP_MAX_CHANNELS_FOR_PCM) ||
WARN_ON(midi_channels > AMDTP_MAX_CHANNELS_FOR_MIDI))
return -EINVAL;
diff --git a/sound/firewire/amdtp.h b/sound/firewire/amdtp-stream.h
index 883bb1a7e25f..883bb1a7e25f 100644
--- a/sound/firewire/amdtp.h
+++ b/sound/firewire/amdtp-stream.h
diff --git a/sound/firewire/bebob/bebob.h b/sound/firewire/bebob/bebob.h
index d23caca7f369..72a1c5e404fd 100644
--- a/sound/firewire/bebob/bebob.h
+++ b/sound/firewire/bebob/bebob.h
@@ -31,7 +31,7 @@
#include "../fcp.h"
#include "../packets-buffer.h"
#include "../iso-resources.h"
-#include "../amdtp.h"
+#include "../amdtp-stream.h"
#include "../cmp.h"
/* basic register addresses on DM1000/DM1100/DM1500 */
diff --git a/sound/firewire/dice/dice.h b/sound/firewire/dice/dice.h
index ecf5dc862235..29578c19e977 100644
--- a/sound/firewire/dice/dice.h
+++ b/sound/firewire/dice/dice.h
@@ -34,7 +34,7 @@
#include <sound/pcm_params.h>
#include <sound/rawmidi.h>
-#include "../amdtp.h"
+#include "../amdtp-stream.h"
#include "../iso-resources.h"
#include "../lib.h"
#include "dice-interface.h"
diff --git a/sound/firewire/fcp.c b/sound/firewire/fcp.c
index 0619597e3a3f..cce19768f43d 100644
--- a/sound/firewire/fcp.c
+++ b/sound/firewire/fcp.c
@@ -17,7 +17,7 @@
#include <linux/delay.h>
#include "fcp.h"
#include "lib.h"
-#include "amdtp.h"
+#include "amdtp-stream.h"
#define CTS_AVC 0x00
diff --git a/sound/firewire/fireworks/fireworks.h b/sound/firewire/fireworks/fireworks.h
index 084d414b228c..d54f17134495 100644
--- a/sound/firewire/fireworks/fireworks.h
+++ b/sound/firewire/fireworks/fireworks.h
@@ -29,7 +29,7 @@
#include "../packets-buffer.h"
#include "../iso-resources.h"
-#include "../amdtp.h"
+#include "../amdtp-stream.h"
#include "../cmp.h"
#include "../lib.h"
diff --git a/sound/firewire/oxfw/oxfw.h b/sound/firewire/oxfw/oxfw.h
index cace5ad4fe76..2c3d20b61cbe 100644
--- a/sound/firewire/oxfw/oxfw.h
+++ b/sound/firewire/oxfw/oxfw.h
@@ -28,7 +28,7 @@
#include "../fcp.h"
#include "../packets-buffer.h"
#include "../iso-resources.h"
-#include "../amdtp.h"
+#include "../amdtp-stream.h"
#include "../cmp.h"
struct device_info {