aboutsummaryrefslogtreecommitdiffstats
path: root/sound/firewire/bebob
diff options
context:
space:
mode:
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>2014-05-27 11:14:42 -0400
committerTakashi Iwai <tiwai@suse.de>2014-05-27 11:35:30 -0400
commit9b5f0edfd247bd528bfe1607f1b077684abb9973 (patch)
tree5d2db9751c6737a1ef637a641b3d9f65bc7cf692 /sound/firewire/bebob
parenta6b598bf4b4117597479cc0d6204df6d4d8f2635 (diff)
ALSA: fireworks/bebob: Add suffix for long long integer literal
This commit adds suffix to register values of each device, to supress 'sparse' warnings. Additionally, this commit changes offset values with integer literal. Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire/bebob')
-rw-r--r--sound/firewire/bebob/bebob.h4
-rw-r--r--sound/firewire/bebob/bebob_focusrite.c20
-rw-r--r--sound/firewire/bebob/bebob_maudio.c4
3 files changed, 14 insertions, 14 deletions
diff --git a/sound/firewire/bebob/bebob.h b/sound/firewire/bebob/bebob.h
index 6aef1520d720..d1c93a1e0978 100644
--- a/sound/firewire/bebob/bebob.h
+++ b/sound/firewire/bebob/bebob.h
@@ -35,8 +35,8 @@
35#include "../cmp.h" 35#include "../cmp.h"
36 36
37/* basic register addresses on DM1000/DM1100/DM1500 */ 37/* basic register addresses on DM1000/DM1100/DM1500 */
38#define BEBOB_ADDR_REG_INFO 0xffffc8020000 38#define BEBOB_ADDR_REG_INFO 0xffffc8020000ULL
39#define BEBOB_ADDR_REG_REQ 0xffffc8021000 39#define BEBOB_ADDR_REG_REQ 0xffffc8021000ULL
40 40
41struct snd_bebob; 41struct snd_bebob;
42 42
diff --git a/sound/firewire/bebob/bebob_focusrite.c b/sound/firewire/bebob/bebob_focusrite.c
index cd29dbc4b691..e71066d6f7cb 100644
--- a/sound/firewire/bebob/bebob_focusrite.c
+++ b/sound/firewire/bebob/bebob_focusrite.c
@@ -14,15 +14,15 @@
14#define DIG_OUT "Digital Out" 14#define DIG_OUT "Digital Out"
15#define STM_IN "Stream In" 15#define STM_IN "Stream In"
16 16
17#define SAFFIRE_ADDRESS_BASE 0x000100000000 17#define SAFFIRE_ADDRESS_BASE 0x000100000000ULL
18 18
19#define SAFFIRE_OFFSET_CLOCK_SOURCE 0x0000000000f8 19#define SAFFIRE_OFFSET_CLOCK_SOURCE 0x00f8
20#define SAFFIREPRO_OFFSET_CLOCK_SOURCE 0x000000000174 20#define SAFFIREPRO_OFFSET_CLOCK_SOURCE 0x0174
21 21
22/* whether sync to external device or not */ 22/* whether sync to external device or not */
23#define SAFFIRE_OFFSET_CLOCK_SYNC_EXT 0x00000000013c 23#define SAFFIRE_OFFSET_CLOCK_SYNC_EXT 0x013c
24#define SAFFIRE_LE_OFFSET_CLOCK_SYNC_EXT 0x000000000432 24#define SAFFIRE_LE_OFFSET_CLOCK_SYNC_EXT 0x0432
25#define SAFFIREPRO_OFFSET_CLOCK_SYNC_EXT 0x000000000164 25#define SAFFIREPRO_OFFSET_CLOCK_SYNC_EXT 0x0164
26 26
27#define SAFFIRE_CLOCK_SOURCE_INTERNAL 0 27#define SAFFIRE_CLOCK_SOURCE_INTERNAL 0
28#define SAFFIRE_CLOCK_SOURCE_SPDIF 1 28#define SAFFIRE_CLOCK_SOURCE_SPDIF 1
@@ -35,10 +35,10 @@
35#define SAFFIREPRO_CLOCK_SOURCE_WORDCLOCK 5 35#define SAFFIREPRO_CLOCK_SOURCE_WORDCLOCK 5
36 36
37/* S/PDIF, ADAT1, ADAT2 is enabled or not. three quadlets */ 37/* S/PDIF, ADAT1, ADAT2 is enabled or not. three quadlets */
38#define SAFFIREPRO_ENABLE_DIG_IFACES 0x0000000001a4 38#define SAFFIREPRO_ENABLE_DIG_IFACES 0x01a4
39 39
40/* saffirepro has its own parameter for sampling frequency */ 40/* saffirepro has its own parameter for sampling frequency */
41#define SAFFIREPRO_RATE_NOREBOOT 0x0000000001cc 41#define SAFFIREPRO_RATE_NOREBOOT 0x01cc
42/* index is the value for this register */ 42/* index is the value for this register */
43static const unsigned int rates[] = { 43static const unsigned int rates[] = {
44 [0] = 0, 44 [0] = 0,
@@ -51,8 +51,8 @@ static const unsigned int rates[] = {
51}; 51};
52 52
53/* saffire(no label)/saffire LE has metering */ 53/* saffire(no label)/saffire LE has metering */
54#define SAFFIRE_OFFSET_METER 0x000000000100 54#define SAFFIRE_OFFSET_METER 0x0100
55#define SAFFIRE_LE_OFFSET_METER 0x000000000168 55#define SAFFIRE_LE_OFFSET_METER 0x0168
56 56
57static inline int 57static inline int
58saffire_read_block(struct snd_bebob *bebob, u64 offset, 58saffire_read_block(struct snd_bebob *bebob, u64 offset,
diff --git a/sound/firewire/bebob/bebob_maudio.c b/sound/firewire/bebob/bebob_maudio.c
index 52b1a40e5e13..6af50eb80ea7 100644
--- a/sound/firewire/bebob/bebob_maudio.c
+++ b/sound/firewire/bebob/bebob_maudio.c
@@ -49,7 +49,7 @@
49/* padding */ 49/* padding */
50#define MAUDIO_BOOTLOADER_CUE3 0x00000000 50#define MAUDIO_BOOTLOADER_CUE3 0x00000000
51 51
52#define MAUDIO_SPECIFIC_ADDRESS 0xffc700000000 52#define MAUDIO_SPECIFIC_ADDRESS 0xffc700000000ULL
53 53
54#define METER_OFFSET 0x00600000 54#define METER_OFFSET 0x00600000
55 55
@@ -111,7 +111,7 @@ int snd_bebob_maudio_load_firmware(struct fw_unit *unit)
111 * firmware version 5058 or later has date later than "20070401", but 111 * firmware version 5058 or later has date later than "20070401", but
112 * 'date' is not null-terminated. 112 * 'date' is not null-terminated.
113 */ 113 */
114 if (date < 0x3230303730343031) { 114 if (date < 0x3230303730343031LL) {
115 dev_err(&unit->device, 115 dev_err(&unit->device,
116 "Use firmware version 5058 or later\n"); 116 "Use firmware version 5058 or later\n");
117 err = -ENOSYS; 117 err = -ENOSYS;