aboutsummaryrefslogtreecommitdiffstats
path: root/sound/isa
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2015-03-23 15:44:49 -0400
committerTakashi Iwai <tiwai@suse.de>2015-03-24 06:41:37 -0400
commit9a303dc7ba93769e96471158892b264042ddc3fc (patch)
tree69f29edc2be9efacd2a5e852052691029ce903df /sound/isa
parent77008b70fe0a9ffe354580d9dfda329cdde7f20b (diff)
sound: Deparenthesize negative error returns
Make the returns a bit more kernel standard style. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/isa')
-rw-r--r--sound/isa/wavefront/wavefront_fx.c6
-rw-r--r--sound/isa/wavefront/wavefront_synth.c26
2 files changed, 16 insertions, 16 deletions
diff --git a/sound/isa/wavefront/wavefront_fx.c b/sound/isa/wavefront/wavefront_fx.c
index b5a19708473a..0608a5a4289d 100644
--- a/sound/isa/wavefront/wavefront_fx.c
+++ b/sound/isa/wavefront/wavefront_fx.c
@@ -79,13 +79,13 @@ wavefront_fx_memset (snd_wavefront_t *dev,
79 if (page < 0 || page > 7) { 79 if (page < 0 || page > 7) {
80 snd_printk ("FX memset: " 80 snd_printk ("FX memset: "
81 "page must be >= 0 and <= 7\n"); 81 "page must be >= 0 and <= 7\n");
82 return -(EINVAL); 82 return -EINVAL;
83 } 83 }
84 84
85 if (addr < 0 || addr > 0x7f) { 85 if (addr < 0 || addr > 0x7f) {
86 snd_printk ("FX memset: " 86 snd_printk ("FX memset: "
87 "addr must be >= 0 and <= 7f\n"); 87 "addr must be >= 0 and <= 7f\n");
88 return -(EINVAL); 88 return -EINVAL;
89 } 89 }
90 90
91 if (cnt == 1) { 91 if (cnt == 1) {
@@ -118,7 +118,7 @@ wavefront_fx_memset (snd_wavefront_t *dev,
118 snd_printk ("FX memset " 118 snd_printk ("FX memset "
119 "(0x%x, 0x%x, 0x%lx, %d) incomplete\n", 119 "(0x%x, 0x%x, 0x%lx, %d) incomplete\n",
120 page, addr, (unsigned long) data, cnt); 120 page, addr, (unsigned long) data, cnt);
121 return -(EIO); 121 return -EIO;
122 } 122 }
123 } 123 }
124 124
diff --git a/sound/isa/wavefront/wavefront_synth.c b/sound/isa/wavefront/wavefront_synth.c
index 33f5ec14fcfa..69f76ff5693d 100644
--- a/sound/isa/wavefront/wavefront_synth.c
+++ b/sound/isa/wavefront/wavefront_synth.c
@@ -793,7 +793,7 @@ wavefront_send_patch (snd_wavefront_t *dev, wavefront_patch_info *header)
793 793
794 if (snd_wavefront_cmd (dev, WFC_DOWNLOAD_PATCH, NULL, buf)) { 794 if (snd_wavefront_cmd (dev, WFC_DOWNLOAD_PATCH, NULL, buf)) {
795 snd_printk ("download patch failed\n"); 795 snd_printk ("download patch failed\n");
796 return -(EIO); 796 return -EIO;
797 } 797 }
798 798
799 return (0); 799 return (0);
@@ -831,7 +831,7 @@ wavefront_send_program (snd_wavefront_t *dev, wavefront_patch_info *header)
831 831
832 if (snd_wavefront_cmd (dev, WFC_DOWNLOAD_PROGRAM, NULL, buf)) { 832 if (snd_wavefront_cmd (dev, WFC_DOWNLOAD_PROGRAM, NULL, buf)) {
833 snd_printk ("download patch failed\n"); 833 snd_printk ("download patch failed\n");
834 return -(EIO); 834 return -EIO;
835 } 835 }
836 836
837 return (0); 837 return (0);
@@ -952,7 +952,7 @@ wavefront_send_sample (snd_wavefront_t *dev,
952 if (skip > 0 && header->hdr.s.SampleResolution != LINEAR_16BIT) { 952 if (skip > 0 && header->hdr.s.SampleResolution != LINEAR_16BIT) {
953 snd_printk ("channel selection only " 953 snd_printk ("channel selection only "
954 "possible on 16-bit samples"); 954 "possible on 16-bit samples");
955 return -(EINVAL); 955 return -EINVAL;
956 } 956 }
957 957
958 switch (skip) { 958 switch (skip) {
@@ -1049,7 +1049,7 @@ wavefront_send_sample (snd_wavefront_t *dev,
1049 NULL, sample_hdr)) { 1049 NULL, sample_hdr)) {
1050 snd_printk ("sample %sdownload refused.\n", 1050 snd_printk ("sample %sdownload refused.\n",
1051 header->size ? "" : "header "); 1051 header->size ? "" : "header ");
1052 return -(EIO); 1052 return -EIO;
1053 } 1053 }
1054 1054
1055 if (header->size == 0) { 1055 if (header->size == 0) {
@@ -1075,7 +1075,7 @@ wavefront_send_sample (snd_wavefront_t *dev,
1075 if (snd_wavefront_cmd (dev, WFC_DOWNLOAD_BLOCK, NULL, NULL)) { 1075 if (snd_wavefront_cmd (dev, WFC_DOWNLOAD_BLOCK, NULL, NULL)) {
1076 snd_printk ("download block " 1076 snd_printk ("download block "
1077 "request refused.\n"); 1077 "request refused.\n");
1078 return -(EIO); 1078 return -EIO;
1079 } 1079 }
1080 1080
1081 for (i = 0; i < blocksize; i++) { 1081 for (i = 0; i < blocksize; i++) {
@@ -1135,12 +1135,12 @@ wavefront_send_sample (snd_wavefront_t *dev,
1135 if (dma_ack == -1) { 1135 if (dma_ack == -1) {
1136 snd_printk ("upload sample " 1136 snd_printk ("upload sample "
1137 "DMA ack timeout\n"); 1137 "DMA ack timeout\n");
1138 return -(EIO); 1138 return -EIO;
1139 } else { 1139 } else {
1140 snd_printk ("upload sample " 1140 snd_printk ("upload sample "
1141 "DMA ack error 0x%x\n", 1141 "DMA ack error 0x%x\n",
1142 dma_ack); 1142 dma_ack);
1143 return -(EIO); 1143 return -EIO;
1144 } 1144 }
1145 } 1145 }
1146 } 1146 }
@@ -1181,7 +1181,7 @@ wavefront_send_alias (snd_wavefront_t *dev, wavefront_patch_info *header)
1181 1181
1182 if (snd_wavefront_cmd (dev, WFC_DOWNLOAD_SAMPLE_ALIAS, NULL, alias_hdr)) { 1182 if (snd_wavefront_cmd (dev, WFC_DOWNLOAD_SAMPLE_ALIAS, NULL, alias_hdr)) {
1183 snd_printk ("download alias failed.\n"); 1183 snd_printk ("download alias failed.\n");
1184 return -(EIO); 1184 return -EIO;
1185 } 1185 }
1186 1186
1187 dev->sample_status[header->number] = (WF_SLOT_FILLED|WF_ST_ALIAS); 1187 dev->sample_status[header->number] = (WF_SLOT_FILLED|WF_ST_ALIAS);
@@ -1232,7 +1232,7 @@ wavefront_send_multisample (snd_wavefront_t *dev, wavefront_patch_info *header)
1232 msample_hdr)) { 1232 msample_hdr)) {
1233 snd_printk ("download of multisample failed.\n"); 1233 snd_printk ("download of multisample failed.\n");
1234 kfree(msample_hdr); 1234 kfree(msample_hdr);
1235 return -(EIO); 1235 return -EIO;
1236 } 1236 }
1237 1237
1238 dev->sample_status[header->number] = (WF_SLOT_FILLED|WF_ST_MULTISAMPLE); 1238 dev->sample_status[header->number] = (WF_SLOT_FILLED|WF_ST_MULTISAMPLE);
@@ -1254,7 +1254,7 @@ wavefront_fetch_multisample (snd_wavefront_t *dev,
1254 1254
1255 if (snd_wavefront_cmd (dev, WFC_UPLOAD_MULTISAMPLE, log_ns, number)) { 1255 if (snd_wavefront_cmd (dev, WFC_UPLOAD_MULTISAMPLE, log_ns, number)) {
1256 snd_printk ("upload multisample failed.\n"); 1256 snd_printk ("upload multisample failed.\n");
1257 return -(EIO); 1257 return -EIO;
1258 } 1258 }
1259 1259
1260 DPRINT (WF_DEBUG_DATA, "msample %d has %d samples\n", 1260 DPRINT (WF_DEBUG_DATA, "msample %d has %d samples\n",
@@ -1273,14 +1273,14 @@ wavefront_fetch_multisample (snd_wavefront_t *dev,
1273 if ((val = wavefront_read (dev)) == -1) { 1273 if ((val = wavefront_read (dev)) == -1) {
1274 snd_printk ("upload multisample failed " 1274 snd_printk ("upload multisample failed "
1275 "during sample loop.\n"); 1275 "during sample loop.\n");
1276 return -(EIO); 1276 return -EIO;
1277 } 1277 }
1278 d[0] = val; 1278 d[0] = val;
1279 1279
1280 if ((val = wavefront_read (dev)) == -1) { 1280 if ((val = wavefront_read (dev)) == -1) {
1281 snd_printk ("upload multisample failed " 1281 snd_printk ("upload multisample failed "
1282 "during sample loop.\n"); 1282 "during sample loop.\n");
1283 return -(EIO); 1283 return -EIO;
1284 } 1284 }
1285 d[1] = val; 1285 d[1] = val;
1286 1286
@@ -1315,7 +1315,7 @@ wavefront_send_drum (snd_wavefront_t *dev, wavefront_patch_info *header)
1315 1315
1316 if (snd_wavefront_cmd (dev, WFC_DOWNLOAD_EDRUM_PROGRAM, NULL, drumbuf)) { 1316 if (snd_wavefront_cmd (dev, WFC_DOWNLOAD_EDRUM_PROGRAM, NULL, drumbuf)) {
1317 snd_printk ("download drum failed.\n"); 1317 snd_printk ("download drum failed.\n");
1318 return -(EIO); 1318 return -EIO;
1319 } 1319 }
1320 1320
1321 return (0); 1321 return (0);