* [PATCH 0/7] sound: fix sparse warnings
@ 2009-02-25 21:26 ` Hannes Eder
0 siblings, 0 replies; 18+ messages in thread
From: Hannes Eder @ 2009-02-25 21:26 UTC (permalink / raw)
To: Takashi Iwai; +Cc: kernel-janitors, linux-kernel
The following series fixes some sparse warnings in sound/.
---
Hannes Eder (7):
sound/oss: fix sparse warning: symbol shadows an earlier one
sound/oss: fix sparse warnings: different signedness
sound/drivers/vx: fix sparse warning: different signedness
sound/pci/emu10k1: fix sparse warning: different signedness
sound/pci/hda: fix sparse warning: different signedness
sound/usb/usx2y: fix sparse warning: do-while statement is not a compound ...
sound/usb/usx2y: fix sparse warning: Should it be static?
sound/drivers/vx/vx_uer.c | 2 +-
sound/oss/pss.c | 12 ++++++------
sound/oss/sequencer.c | 3 +--
sound/pci/emu10k1/emu10k1_main.c | 10 ++++------
sound/pci/hda/hda_local.h | 2 +-
sound/usb/usx2y/usX2Yhwdep.c | 3 ---
sound/usb/usx2y/usbusx2y.c | 4 ++--
sound/usb/usx2y/usx2yhwdeppcm.h | 2 ++
8 files changed, 17 insertions(+), 21 deletions(-)
^ permalink raw reply [flat|nested] 18+ messages in thread* [PATCH 1/7] sound/usb/usx2y: fix sparse warning: Should it be static?
2009-02-25 21:26 ` Hannes Eder
@ 2009-02-25 21:26 ` Hannes Eder
-1 siblings, 0 replies; 18+ messages in thread
From: Hannes Eder @ 2009-02-25 21:26 UTC (permalink / raw)
To: Takashi Iwai; +Cc: kernel-janitors, linux-kernel
Impact: Move declaration to header file.
Fix this sparse warning:
sound/usb/usx2y/usx2yhwdeppcm.c:739:5: warning: symbol 'usX2Y_hwdep_pcm_new' was not declared. Should it be static?
Signed-off-by: Hannes Eder <hannes@hanneseder.net>
---
sound/usb/usx2y/usX2Yhwdep.c | 3 ---
sound/usb/usx2y/usx2yhwdeppcm.h | 2 ++
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/sound/usb/usx2y/usX2Yhwdep.c b/sound/usb/usx2y/usX2Yhwdep.c
index a26d8d8..4af8740 100644
--- a/sound/usb/usx2y/usX2Yhwdep.c
+++ b/sound/usb/usx2y/usX2Yhwdep.c
@@ -30,9 +30,6 @@
#include "usbusx2y.h"
#include "usX2Yhwdep.h"
-int usX2Y_hwdep_pcm_new(struct snd_card *card);
-
-
static int snd_us428ctls_vm_fault(struct vm_area_struct *area,
struct vm_fault *vmf)
{
diff --git a/sound/usb/usx2y/usx2yhwdeppcm.h b/sound/usb/usx2y/usx2yhwdeppcm.h
index c3382fd..9c4fb84 100644
--- a/sound/usb/usx2y/usx2yhwdeppcm.h
+++ b/sound/usb/usx2y/usx2yhwdeppcm.h
@@ -18,3 +18,5 @@ struct snd_usX2Y_hwdep_pcm_shm {
volatile unsigned captured_iso_frames;
int capture_iso_start;
};
+
+int usX2Y_hwdep_pcm_new(struct snd_card *card);
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 1/7] sound/usb/usx2y: fix sparse warning: Should it be static?
@ 2009-02-25 21:26 ` Hannes Eder
0 siblings, 0 replies; 18+ messages in thread
From: Hannes Eder @ 2009-02-25 21:26 UTC (permalink / raw)
To: Takashi Iwai; +Cc: kernel-janitors, linux-kernel
Impact: Move declaration to header file.
Fix this sparse warning:
sound/usb/usx2y/usx2yhwdeppcm.c:739:5: warning: symbol 'usX2Y_hwdep_pcm_new' was not declared. Should it be static?
Signed-off-by: Hannes Eder <hannes@hanneseder.net>
---
sound/usb/usx2y/usX2Yhwdep.c | 3 ---
sound/usb/usx2y/usx2yhwdeppcm.h | 2 ++
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/sound/usb/usx2y/usX2Yhwdep.c b/sound/usb/usx2y/usX2Yhwdep.c
index a26d8d8..4af8740 100644
--- a/sound/usb/usx2y/usX2Yhwdep.c
+++ b/sound/usb/usx2y/usX2Yhwdep.c
@@ -30,9 +30,6 @@
#include "usbusx2y.h"
#include "usX2Yhwdep.h"
-int usX2Y_hwdep_pcm_new(struct snd_card *card);
-
-
static int snd_us428ctls_vm_fault(struct vm_area_struct *area,
struct vm_fault *vmf)
{
diff --git a/sound/usb/usx2y/usx2yhwdeppcm.h b/sound/usb/usx2y/usx2yhwdeppcm.h
index c3382fd..9c4fb84 100644
--- a/sound/usb/usx2y/usx2yhwdeppcm.h
+++ b/sound/usb/usx2y/usx2yhwdeppcm.h
@@ -18,3 +18,5 @@ struct snd_usX2Y_hwdep_pcm_shm {
volatile unsigned captured_iso_frames;
int capture_iso_start;
};
+
+int usX2Y_hwdep_pcm_new(struct snd_card *card);
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 2/7] sound/usb/usx2y: fix sparse warning: do-while statement is not a compound ...
2009-02-25 21:26 ` Hannes Eder
@ 2009-02-25 21:28 ` Hannes Eder
-1 siblings, 0 replies; 18+ messages in thread
From: Hannes Eder @ 2009-02-25 21:28 UTC (permalink / raw)
To: Takashi Iwai; +Cc: kernel-janitors, linux-kernel
Fix this sparse warning:
sound/usb/usx2y/usbusx2y.c:231:33: warning: do-while statement is not a compound statement
Signed-off-by: Hannes Eder <hannes@hanneseder.net>
---
This patch generates a checkpatch.pl warning (line is 84 characters long), but
the formating of the entire file is so broken, the longest line is >150 chars long,
so I leave it as is.
sound/usb/usx2y/usbusx2y.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/usb/usx2y/usbusx2y.c b/sound/usb/usx2y/usbusx2y.c
index af8b849..5ce0da2 100644
--- a/sound/usb/usx2y/usbusx2y.c
+++ b/sound/usb/usx2y/usbusx2y.c
@@ -227,9 +227,9 @@ static void i_usX2Y_In04Int(struct urb *urb)
if (usX2Y->US04) {
if (0 == usX2Y->US04->submitted)
- do
+ do {
err = usb_submit_urb(usX2Y->US04->urb[usX2Y->US04->submitted++], GFP_ATOMIC);
- while (!err && usX2Y->US04->submitted < usX2Y->US04->len);
+ } while (!err && usX2Y->US04->submitted < usX2Y->US04->len);
} else
if (us428ctls && us428ctls->p4outLast >= 0 && us428ctls->p4outLast < N_us428_p4out_BUFS) {
if (us428ctls->p4outLast != us428ctls->p4outSent) {
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 2/7] sound/usb/usx2y: fix sparse warning: do-while statement
@ 2009-02-25 21:28 ` Hannes Eder
0 siblings, 0 replies; 18+ messages in thread
From: Hannes Eder @ 2009-02-25 21:28 UTC (permalink / raw)
To: Takashi Iwai; +Cc: kernel-janitors, linux-kernel
Fix this sparse warning:
sound/usb/usx2y/usbusx2y.c:231:33: warning: do-while statement is not a compound statement
Signed-off-by: Hannes Eder <hannes@hanneseder.net>
---
This patch generates a checkpatch.pl warning (line is 84 characters long), but
the formating of the entire file is so broken, the longest line is >150 chars long,
so I leave it as is.
sound/usb/usx2y/usbusx2y.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/usb/usx2y/usbusx2y.c b/sound/usb/usx2y/usbusx2y.c
index af8b849..5ce0da2 100644
--- a/sound/usb/usx2y/usbusx2y.c
+++ b/sound/usb/usx2y/usbusx2y.c
@@ -227,9 +227,9 @@ static void i_usX2Y_In04Int(struct urb *urb)
if (usX2Y->US04) {
if (0 = usX2Y->US04->submitted)
- do
+ do {
err = usb_submit_urb(usX2Y->US04->urb[usX2Y->US04->submitted++], GFP_ATOMIC);
- while (!err && usX2Y->US04->submitted < usX2Y->US04->len);
+ } while (!err && usX2Y->US04->submitted < usX2Y->US04->len);
} else
if (us428ctls && us428ctls->p4outLast >= 0 && us428ctls->p4outLast < N_us428_p4out_BUFS) {
if (us428ctls->p4outLast != us428ctls->p4outSent) {
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 3/7] sound/pci/hda: fix sparse warning: different signedness
2009-02-25 21:26 ` Hannes Eder
@ 2009-02-25 21:28 ` Hannes Eder
-1 siblings, 0 replies; 18+ messages in thread
From: Hannes Eder @ 2009-02-25 21:28 UTC (permalink / raw)
To: Takashi Iwai; +Cc: kernel-janitors, linux-kernel
Fix this sparse warning:
sound/pci/hda/hda_codec.c:1544:19: warning: incorrect type in assignment (different signedness)
sound/pci/hda/hda_codec.c:1544:19: expected unsigned long *vals
sound/pci/hda/hda_codec.c:1544:19: got long *<noident>
Signed-off-by: Hannes Eder <hannes@hanneseder.net>
---
sound/pci/hda/hda_local.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h
index 4bd82a3..03ee9dd 100644
--- a/sound/pci/hda/hda_local.h
+++ b/sound/pci/hda/hda_local.h
@@ -136,7 +136,7 @@ extern struct hda_ctl_ops snd_hda_bind_sw; /* for bind-switch */
struct hda_bind_ctls {
struct hda_ctl_ops *ops;
- long values[];
+ unsigned long values[];
};
int snd_hda_mixer_bind_ctls_info(struct snd_kcontrol *kcontrol,
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 3/7] sound/pci/hda: fix sparse warning: different signedness
@ 2009-02-25 21:28 ` Hannes Eder
0 siblings, 0 replies; 18+ messages in thread
From: Hannes Eder @ 2009-02-25 21:28 UTC (permalink / raw)
To: Takashi Iwai; +Cc: kernel-janitors, linux-kernel
Fix this sparse warning:
sound/pci/hda/hda_codec.c:1544:19: warning: incorrect type in assignment (different signedness)
sound/pci/hda/hda_codec.c:1544:19: expected unsigned long *vals
sound/pci/hda/hda_codec.c:1544:19: got long *<noident>
Signed-off-by: Hannes Eder <hannes@hanneseder.net>
---
sound/pci/hda/hda_local.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h
index 4bd82a3..03ee9dd 100644
--- a/sound/pci/hda/hda_local.h
+++ b/sound/pci/hda/hda_local.h
@@ -136,7 +136,7 @@ extern struct hda_ctl_ops snd_hda_bind_sw; /* for bind-switch */
struct hda_bind_ctls {
struct hda_ctl_ops *ops;
- long values[];
+ unsigned long values[];
};
int snd_hda_mixer_bind_ctls_info(struct snd_kcontrol *kcontrol,
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 4/7] sound/pci/emu10k1: fix sparse warning: different signedness
2009-02-25 21:26 ` Hannes Eder
@ 2009-02-25 21:28 ` Hannes Eder
-1 siblings, 0 replies; 18+ messages in thread
From: Hannes Eder @ 2009-02-25 21:28 UTC (permalink / raw)
To: Takashi Iwai; +Cc: kernel-janitors, linux-kernel
Fix this sparse warnings:
sound/pci/emu10k1/emu10k1_main.c:723:66: warning: incorrect type in argument 3 (different signedness)
sound/pci/emu10k1/emu10k1_main.c:724:68: warning: incorrect type in argument 3 (different signedness)
sound/pci/emu10k1/emu10k1_main.c:748:74: warning: incorrect type in argument 3 (different signedness)
sound/pci/emu10k1/emu10k1_main.c:751:66: warning: incorrect type in argument 3 (different signedness)
sound/pci/emu10k1/emu10k1_main.c:759:73: warning: incorrect type in argument 3 (different signedness)
sound/pci/emu10k1/emu10k1_main.c:760:73: warning: incorrect type in argument 3 (different signedness)
sound/pci/emu10k1/emu10k1_main.c:837:50: warning: incorrect type in argument 3 (different signedness)
sound/pci/emu10k1/emu10k1_main.c:845:50: warning: incorrect type in argument 3 (different signedness)
sound/pci/emu10k1/emu10k1_main.c:881:50: warning: incorrect type in argument 3 (different signedness)
sound/pci/emu10k1/emu10k1_main.c:889:57: warning: incorrect type in argument 3 (different signedness)
sound/pci/emu10k1/emu10k1_main.c:890:57: warning: incorrect type in argument 3 (different signedness)
sound/pci/emu10k1/emu10k1_main.c:895:60: warning: incorrect type in argument 3 (different signedness)
sound/pci/emu10k1/emu10k1_main.c:897:60: warning: incorrect type in argument 3 (different signedness)
sound/pci/emu10k1/emu10k1_main.c:899:60: warning: incorrect type in argument 3 (different signedness)
sound/pci/emu10k1/emu10k1_main.c:910:56: warning: incorrect type in argument 3 (different signedness)
sound/pci/emu10k1/emu10k1_main.c:914:57: warning: incorrect type in argument 3 (different signedness)
sound/pci/emu10k1/emu10k1_main.c:918:56: warning: incorrect type in argument 3 (different signedness)
sound/pci/emu10k1/emu10k1_main.c:922:57: warning: incorrect type in argument 3 (different signedness)
sound/pci/emu10k1/emu10k1_main.c:924:58: warning: incorrect type in argument 3 (different signedness)
sound/pci/emu10k1/emu10k1_main.c:936:60: warning: incorrect type in argument 3 (different signedness)
sound/pci/emu10k1/emu10k1_main.c:1073:60: warning: incorrect type in argument 3 (different signedness)
sound/pci/emu10k1/emu10k1_main.c:1088:60: warning: incorrect type in argument 3 (different signedness)
sound/pci/emu10k1/emu10k1_main.c:1093:58: warning: incorrect type in argument 3 (different signedness)
Signed-off-by: Hannes Eder <hannes@hanneseder.net>
---
sound/pci/emu10k1/emu10k1_main.c | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c
index f76781f..f18bd62 100644
--- a/sound/pci/emu10k1/emu10k1_main.c
+++ b/sound/pci/emu10k1/emu10k1_main.c
@@ -711,8 +711,7 @@ static int snd_emu1010_load_firmware(struct snd_emu10k1 *emu, const char *filena
static int emu1010_firmware_thread(void *data)
{
struct snd_emu10k1 *emu = data;
- int tmp, tmp2;
- int reg;
+ u32 tmp, tmp2, reg;
int err;
for (;;) {
@@ -758,7 +757,7 @@ static int emu1010_firmware_thread(void *data)
snd_printk(KERN_INFO "emu1010: Audio Dock Firmware loaded\n");
snd_emu1010_fpga_read(emu, EMU_DOCK_MAJOR_REV, &tmp);
snd_emu1010_fpga_read(emu, EMU_DOCK_MINOR_REV, &tmp2);
- snd_printk(KERN_INFO "Audio Dock ver:%d.%d\n",
+ snd_printk(KERN_INFO "Audio Dock ver: %u.%u\n",
tmp, tmp2);
/* Sync clocking between 1010 and Dock */
/* Allow DLL to settle */
@@ -805,8 +804,7 @@ static int emu1010_firmware_thread(void *data)
static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu)
{
unsigned int i;
- int tmp, tmp2;
- int reg;
+ u32 tmp, tmp2, reg;
int err;
const char *filename = NULL;
@@ -888,7 +886,7 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu)
snd_printk(KERN_INFO "emu1010: Hana Firmware loaded\n");
snd_emu1010_fpga_read(emu, EMU_HANA_MAJOR_REV, &tmp);
snd_emu1010_fpga_read(emu, EMU_HANA_MINOR_REV, &tmp2);
- snd_printk(KERN_INFO "emu1010: Hana version: %d.%d\n", tmp, tmp2);
+ snd_printk(KERN_INFO "emu1010: Hana version: %u.%u\n", tmp, tmp2);
/* Enable 48Volt power to Audio Dock */
snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_PWR, EMU_HANA_DOCK_PWR_ON);
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 4/7] sound/pci/emu10k1: fix sparse warning: different
@ 2009-02-25 21:28 ` Hannes Eder
0 siblings, 0 replies; 18+ messages in thread
From: Hannes Eder @ 2009-02-25 21:28 UTC (permalink / raw)
To: Takashi Iwai; +Cc: kernel-janitors, linux-kernel
Fix this sparse warnings:
sound/pci/emu10k1/emu10k1_main.c:723:66: warning: incorrect type in argument 3 (different signedness)
sound/pci/emu10k1/emu10k1_main.c:724:68: warning: incorrect type in argument 3 (different signedness)
sound/pci/emu10k1/emu10k1_main.c:748:74: warning: incorrect type in argument 3 (different signedness)
sound/pci/emu10k1/emu10k1_main.c:751:66: warning: incorrect type in argument 3 (different signedness)
sound/pci/emu10k1/emu10k1_main.c:759:73: warning: incorrect type in argument 3 (different signedness)
sound/pci/emu10k1/emu10k1_main.c:760:73: warning: incorrect type in argument 3 (different signedness)
sound/pci/emu10k1/emu10k1_main.c:837:50: warning: incorrect type in argument 3 (different signedness)
sound/pci/emu10k1/emu10k1_main.c:845:50: warning: incorrect type in argument 3 (different signedness)
sound/pci/emu10k1/emu10k1_main.c:881:50: warning: incorrect type in argument 3 (different signedness)
sound/pci/emu10k1/emu10k1_main.c:889:57: warning: incorrect type in argument 3 (different signedness)
sound/pci/emu10k1/emu10k1_main.c:890:57: warning: incorrect type in argument 3 (different signedness)
sound/pci/emu10k1/emu10k1_main.c:895:60: warning: incorrect type in argument 3 (different signedness)
sound/pci/emu10k1/emu10k1_main.c:897:60: warning: incorrect type in argument 3 (different signedness)
sound/pci/emu10k1/emu10k1_main.c:899:60: warning: incorrect type in argument 3 (different signedness)
sound/pci/emu10k1/emu10k1_main.c:910:56: warning: incorrect type in argument 3 (different signedness)
sound/pci/emu10k1/emu10k1_main.c:914:57: warning: incorrect type in argument 3 (different signedness)
sound/pci/emu10k1/emu10k1_main.c:918:56: warning: incorrect type in argument 3 (different signedness)
sound/pci/emu10k1/emu10k1_main.c:922:57: warning: incorrect type in argument 3 (different signedness)
sound/pci/emu10k1/emu10k1_main.c:924:58: warning: incorrect type in argument 3 (different signedness)
sound/pci/emu10k1/emu10k1_main.c:936:60: warning: incorrect type in argument 3 (different signedness)
sound/pci/emu10k1/emu10k1_main.c:1073:60: warning: incorrect type in argument 3 (different signedness)
sound/pci/emu10k1/emu10k1_main.c:1088:60: warning: incorrect type in argument 3 (different signedness)
sound/pci/emu10k1/emu10k1_main.c:1093:58: warning: incorrect type in argument 3 (different signedness)
Signed-off-by: Hannes Eder <hannes@hanneseder.net>
---
sound/pci/emu10k1/emu10k1_main.c | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c
index f76781f..f18bd62 100644
--- a/sound/pci/emu10k1/emu10k1_main.c
+++ b/sound/pci/emu10k1/emu10k1_main.c
@@ -711,8 +711,7 @@ static int snd_emu1010_load_firmware(struct snd_emu10k1 *emu, const char *filena
static int emu1010_firmware_thread(void *data)
{
struct snd_emu10k1 *emu = data;
- int tmp, tmp2;
- int reg;
+ u32 tmp, tmp2, reg;
int err;
for (;;) {
@@ -758,7 +757,7 @@ static int emu1010_firmware_thread(void *data)
snd_printk(KERN_INFO "emu1010: Audio Dock Firmware loaded\n");
snd_emu1010_fpga_read(emu, EMU_DOCK_MAJOR_REV, &tmp);
snd_emu1010_fpga_read(emu, EMU_DOCK_MINOR_REV, &tmp2);
- snd_printk(KERN_INFO "Audio Dock ver:%d.%d\n",
+ snd_printk(KERN_INFO "Audio Dock ver: %u.%u\n",
tmp, tmp2);
/* Sync clocking between 1010 and Dock */
/* Allow DLL to settle */
@@ -805,8 +804,7 @@ static int emu1010_firmware_thread(void *data)
static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu)
{
unsigned int i;
- int tmp, tmp2;
- int reg;
+ u32 tmp, tmp2, reg;
int err;
const char *filename = NULL;
@@ -888,7 +886,7 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu)
snd_printk(KERN_INFO "emu1010: Hana Firmware loaded\n");
snd_emu1010_fpga_read(emu, EMU_HANA_MAJOR_REV, &tmp);
snd_emu1010_fpga_read(emu, EMU_HANA_MINOR_REV, &tmp2);
- snd_printk(KERN_INFO "emu1010: Hana version: %d.%d\n", tmp, tmp2);
+ snd_printk(KERN_INFO "emu1010: Hana version: %u.%u\n", tmp, tmp2);
/* Enable 48Volt power to Audio Dock */
snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_PWR, EMU_HANA_DOCK_PWR_ON);
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 5/7] sound/drivers/vx: fix sparse warning: different signedness
2009-02-25 21:26 ` Hannes Eder
@ 2009-02-25 21:29 ` Hannes Eder
-1 siblings, 0 replies; 18+ messages in thread
From: Hannes Eder @ 2009-02-25 21:29 UTC (permalink / raw)
To: Takashi Iwai; +Cc: kernel-janitors, linux-kernel
Fix this sparse warning:
sound/drivers/vx/vx_uer.c:301:42: warning: incorrect type in argument 2 (different signedness)
Signed-off-by: Hannes Eder <hannes@hanneseder.net>
---
sound/drivers/vx/vx_uer.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/sound/drivers/vx/vx_uer.c b/sound/drivers/vx/vx_uer.c
index 0e1ba9b..b0560fe 100644
--- a/sound/drivers/vx/vx_uer.c
+++ b/sound/drivers/vx/vx_uer.c
@@ -103,7 +103,7 @@ static void vx_write_one_cbit(struct vx_core *chip, int index, int val)
* returns the frequency of UER, or 0 if not sync,
* or a negative error code.
*/
-static int vx_read_uer_status(struct vx_core *chip, int *mode)
+static int vx_read_uer_status(struct vx_core *chip, unsigned int *mode)
{
int val, freq;
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 5/7] sound/drivers/vx: fix sparse warning: different signedness
@ 2009-02-25 21:29 ` Hannes Eder
0 siblings, 0 replies; 18+ messages in thread
From: Hannes Eder @ 2009-02-25 21:29 UTC (permalink / raw)
To: Takashi Iwai; +Cc: kernel-janitors, linux-kernel
Fix this sparse warning:
sound/drivers/vx/vx_uer.c:301:42: warning: incorrect type in argument 2 (different signedness)
Signed-off-by: Hannes Eder <hannes@hanneseder.net>
---
sound/drivers/vx/vx_uer.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/sound/drivers/vx/vx_uer.c b/sound/drivers/vx/vx_uer.c
index 0e1ba9b..b0560fe 100644
--- a/sound/drivers/vx/vx_uer.c
+++ b/sound/drivers/vx/vx_uer.c
@@ -103,7 +103,7 @@ static void vx_write_one_cbit(struct vx_core *chip, int index, int val)
* returns the frequency of UER, or 0 if not sync,
* or a negative error code.
*/
-static int vx_read_uer_status(struct vx_core *chip, int *mode)
+static int vx_read_uer_status(struct vx_core *chip, unsigned int *mode)
{
int val, freq;
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 6/7] sound/oss: fix sparse warnings: different signedness
2009-02-25 21:26 ` Hannes Eder
@ 2009-02-25 21:29 ` Hannes Eder
-1 siblings, 0 replies; 18+ messages in thread
From: Hannes Eder @ 2009-02-25 21:29 UTC (permalink / raw)
To: Takashi Iwai; +Cc: kernel-janitors, linux-kernel
Impact: Change signature of 'set_volume_stereo' and 'set_volume_mono'.
Fix this sparse warnings:
sound/oss/pss.c:545:42: warning: incorrect type in argument 2 (different signedness)
sound/oss/pss.c:546:42: warning: incorrect type in argument 3 (different signedness)
sound/oss/pss.c:554:59: warning: incorrect type in argument 2 (different signedness)
sound/oss/pss.c:560:59: warning: incorrect type in argument 2 (different signedness)
sound/oss/pss.c:566:59: warning: incorrect type in argument 2 (different signedness)
Signed-off-by: Hannes Eder <hannes@hanneseder.net>
---
sound/oss/pss.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/sound/oss/pss.c b/sound/oss/pss.c
index 902b39e..83f5ee2 100644
--- a/sound/oss/pss.c
+++ b/sound/oss/pss.c
@@ -457,10 +457,9 @@ static void pss_mixer_reset(pss_confdata *devc)
}
}
-static int set_volume_mono(unsigned __user *p, int *aleft)
+static int set_volume_mono(unsigned __user *p, unsigned int *aleft)
{
- int left;
- unsigned volume;
+ unsigned int left, volume;
if (get_user(volume, p))
return -EFAULT;
@@ -471,10 +470,11 @@ static int set_volume_mono(unsigned __user *p, int *aleft)
return 0;
}
-static int set_volume_stereo(unsigned __user *p, int *aleft, int *aright)
+static int set_volume_stereo(unsigned __user *p,
+ unsigned int *aleft,
+ unsigned int *aright)
{
- int left, right;
- unsigned volume;
+ unsigned int left, right, volume;
if (get_user(volume, p))
return -EFAULT;
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 6/7] sound/oss: fix sparse warnings: different signedness
@ 2009-02-25 21:29 ` Hannes Eder
0 siblings, 0 replies; 18+ messages in thread
From: Hannes Eder @ 2009-02-25 21:29 UTC (permalink / raw)
To: Takashi Iwai; +Cc: kernel-janitors, linux-kernel
Impact: Change signature of 'set_volume_stereo' and 'set_volume_mono'.
Fix this sparse warnings:
sound/oss/pss.c:545:42: warning: incorrect type in argument 2 (different signedness)
sound/oss/pss.c:546:42: warning: incorrect type in argument 3 (different signedness)
sound/oss/pss.c:554:59: warning: incorrect type in argument 2 (different signedness)
sound/oss/pss.c:560:59: warning: incorrect type in argument 2 (different signedness)
sound/oss/pss.c:566:59: warning: incorrect type in argument 2 (different signedness)
Signed-off-by: Hannes Eder <hannes@hanneseder.net>
---
sound/oss/pss.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/sound/oss/pss.c b/sound/oss/pss.c
index 902b39e..83f5ee2 100644
--- a/sound/oss/pss.c
+++ b/sound/oss/pss.c
@@ -457,10 +457,9 @@ static void pss_mixer_reset(pss_confdata *devc)
}
}
-static int set_volume_mono(unsigned __user *p, int *aleft)
+static int set_volume_mono(unsigned __user *p, unsigned int *aleft)
{
- int left;
- unsigned volume;
+ unsigned int left, volume;
if (get_user(volume, p))
return -EFAULT;
@@ -471,10 +470,11 @@ static int set_volume_mono(unsigned __user *p, int *aleft)
return 0;
}
-static int set_volume_stereo(unsigned __user *p, int *aleft, int *aright)
+static int set_volume_stereo(unsigned __user *p,
+ unsigned int *aleft,
+ unsigned int *aright)
{
- int left, right;
- unsigned volume;
+ unsigned int left, right, volume;
if (get_user(volume, p))
return -EFAULT;
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 7/7] sound/oss: fix sparse warning: symbol shadows an earlier one
2009-02-25 21:26 ` Hannes Eder
@ 2009-02-25 21:29 ` Hannes Eder
-1 siblings, 0 replies; 18+ messages in thread
From: Hannes Eder @ 2009-02-25 21:29 UTC (permalink / raw)
To: Takashi Iwai; +Cc: kernel-janitors, linux-kernel
Impact: Move variable to a more inner scope.
Fix this sparse warning:
sound/oss/sequencer.c:235:29: warning: symbol 'err' shadows an earlier one
sound/oss/sequencer.c:215:13: originally declared here
Signed-off-by: Hannes Eder <hannes@hanneseder.net>
---
sound/oss/sequencer.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/sound/oss/sequencer.c b/sound/oss/sequencer.c
index 5c215f7..c798746 100644
--- a/sound/oss/sequencer.c
+++ b/sound/oss/sequencer.c
@@ -212,7 +212,6 @@ int sequencer_write(int dev, struct file *file, const char __user *buf, int coun
{
unsigned char event_rec[EV_SZ], ev_code;
int p = 0, c, ev_size;
- int err;
int mode = translate_mode(file);
dev = dev >> 4;
@@ -285,7 +284,7 @@ int sequencer_write(int dev, struct file *file, const char __user *buf, int coun
{
if (!midi_opened[event_rec[2]])
{
- int mode;
+ int err, mode;
int dev = event_rec[2];
if (dev >= max_mididev || midi_devs[dev]==NULL)
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 7/7] sound/oss: fix sparse warning: symbol shadows an earlier
@ 2009-02-25 21:29 ` Hannes Eder
0 siblings, 0 replies; 18+ messages in thread
From: Hannes Eder @ 2009-02-25 21:29 UTC (permalink / raw)
To: Takashi Iwai; +Cc: kernel-janitors, linux-kernel
Impact: Move variable to a more inner scope.
Fix this sparse warning:
sound/oss/sequencer.c:235:29: warning: symbol 'err' shadows an earlier one
sound/oss/sequencer.c:215:13: originally declared here
Signed-off-by: Hannes Eder <hannes@hanneseder.net>
---
sound/oss/sequencer.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/sound/oss/sequencer.c b/sound/oss/sequencer.c
index 5c215f7..c798746 100644
--- a/sound/oss/sequencer.c
+++ b/sound/oss/sequencer.c
@@ -212,7 +212,6 @@ int sequencer_write(int dev, struct file *file, const char __user *buf, int coun
{
unsigned char event_rec[EV_SZ], ev_code;
int p = 0, c, ev_size;
- int err;
int mode = translate_mode(file);
dev = dev >> 4;
@@ -285,7 +284,7 @@ int sequencer_write(int dev, struct file *file, const char __user *buf, int coun
{
if (!midi_opened[event_rec[2]])
{
- int mode;
+ int err, mode;
int dev = event_rec[2];
if (dev >= max_mididev || midi_devs[dev]=NULL)
^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [PATCH 0/7] sound: fix sparse warnings
2009-02-25 21:26 ` Hannes Eder
@ 2009-02-26 9:01 ` Takashi Iwai
-1 siblings, 0 replies; 18+ messages in thread
From: Takashi Iwai @ 2009-02-26 9:01 UTC (permalink / raw)
To: Hannes Eder; +Cc: kernel-janitors, linux-kernel
At Wed, 25 Feb 2009 22:26:34 +0100,
Hannes Eder wrote:
>
> The following series fixes some sparse warnings in sound/.
Applied all patches now. Thanks!
Takashi
>
> ---
>
> Hannes Eder (7):
> sound/oss: fix sparse warning: symbol shadows an earlier one
> sound/oss: fix sparse warnings: different signedness
> sound/drivers/vx: fix sparse warning: different signedness
> sound/pci/emu10k1: fix sparse warning: different signedness
> sound/pci/hda: fix sparse warning: different signedness
> sound/usb/usx2y: fix sparse warning: do-while statement is not a compound ...
> sound/usb/usx2y: fix sparse warning: Should it be static?
>
>
> sound/drivers/vx/vx_uer.c | 2 +-
> sound/oss/pss.c | 12 ++++++------
> sound/oss/sequencer.c | 3 +--
> sound/pci/emu10k1/emu10k1_main.c | 10 ++++------
> sound/pci/hda/hda_local.h | 2 +-
> sound/usb/usx2y/usX2Yhwdep.c | 3 ---
> sound/usb/usx2y/usbusx2y.c | 4 ++--
> sound/usb/usx2y/usx2yhwdeppcm.h | 2 ++
> 8 files changed, 17 insertions(+), 21 deletions(-)
>
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 0/7] sound: fix sparse warnings
@ 2009-02-26 9:01 ` Takashi Iwai
0 siblings, 0 replies; 18+ messages in thread
From: Takashi Iwai @ 2009-02-26 9:01 UTC (permalink / raw)
To: Hannes Eder; +Cc: kernel-janitors, linux-kernel
At Wed, 25 Feb 2009 22:26:34 +0100,
Hannes Eder wrote:
>
> The following series fixes some sparse warnings in sound/.
Applied all patches now. Thanks!
Takashi
>
> ---
>
> Hannes Eder (7):
> sound/oss: fix sparse warning: symbol shadows an earlier one
> sound/oss: fix sparse warnings: different signedness
> sound/drivers/vx: fix sparse warning: different signedness
> sound/pci/emu10k1: fix sparse warning: different signedness
> sound/pci/hda: fix sparse warning: different signedness
> sound/usb/usx2y: fix sparse warning: do-while statement is not a compound ...
> sound/usb/usx2y: fix sparse warning: Should it be static?
>
>
> sound/drivers/vx/vx_uer.c | 2 +-
> sound/oss/pss.c | 12 ++++++------
> sound/oss/sequencer.c | 3 +--
> sound/pci/emu10k1/emu10k1_main.c | 10 ++++------
> sound/pci/hda/hda_local.h | 2 +-
> sound/usb/usx2y/usX2Yhwdep.c | 3 ---
> sound/usb/usx2y/usbusx2y.c | 4 ++--
> sound/usb/usx2y/usx2yhwdeppcm.h | 2 ++
> 8 files changed, 17 insertions(+), 21 deletions(-)
>
^ permalink raw reply [flat|nested] 18+ messages in thread