From 1d606f1ae5b9d83d8749f21bc04842596104bf55 Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Tue, 18 Apr 2006 13:37:08 +0200 Subject: [ALSA] sound/pci/: remove duplicate #include's There's no reason for #include'ing linux/dma-mapping.h more than once. Signed-off-by: Adrian Bunk Signed-off-by: Takashi Iwai --- sound/pci/pcxhr/pcxhr.c | 1 - 1 file changed, 1 deletion(-) (limited to 'sound/pci/pcxhr') diff --git a/sound/pci/pcxhr/pcxhr.c b/sound/pci/pcxhr/pcxhr.c index 35875c8aa29..f679779d96e 100644 --- a/sound/pci/pcxhr/pcxhr.c +++ b/sound/pci/pcxhr/pcxhr.c @@ -30,7 +30,6 @@ #include #include #include -#include #include #include -- cgit v1.2.3 From 711ee39bf3e2a69005d64f388441a6f883495f83 Mon Sep 17 00:00:00 2001 From: Henrik Kretzschmar Date: Thu, 20 Apr 2006 12:37:00 +0200 Subject: [ALSA] pcxhr - Fix a compiler warning on 64bit architectures The patch fixes a conpile warning on 64bit architectures, caused by different sizes of size_t . Since size_t is unsigned I permited myself to cange the format, too. Signed-off-by: Henrik Kretzschmar Signed-off-by: Takashi Iwai --- sound/pci/pcxhr/pcxhr_hwdep.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sound/pci/pcxhr') diff --git a/sound/pci/pcxhr/pcxhr_hwdep.c b/sound/pci/pcxhr/pcxhr_hwdep.c index 03517c10e99..369c19fea98 100644 --- a/sound/pci/pcxhr/pcxhr_hwdep.c +++ b/sound/pci/pcxhr/pcxhr_hwdep.c @@ -385,8 +385,8 @@ static int pcxhr_hwdep_dsp_load(struct snd_hwdep *hw, fw.size = dsp->length; fw.data = vmalloc(fw.size); if (! fw.data) { - snd_printk(KERN_ERR "pcxhr: cannot allocate dsp image (%d bytes)\n", - fw.size); + snd_printk(KERN_ERR "pcxhr: cannot allocate dsp image (%lu bytes)\n", + (unsigned long)fw.size); return -ENOMEM; } if (copy_from_user(fw.data, dsp->image, dsp->length)) { -- cgit v1.2.3 From 396c9b928d5c24775846a161a8191dcc1ea4971f Mon Sep 17 00:00:00 2001 From: Henrik Kretzschmar Date: Mon, 24 Apr 2006 15:59:04 +0200 Subject: [ALSA] add __devinitdata to all pci_device_id Signed-off-by: Henrik Kretzschmar Signed-off-by: Takashi Iwai --- sound/pci/pcxhr/pcxhr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sound/pci/pcxhr') diff --git a/sound/pci/pcxhr/pcxhr.c b/sound/pci/pcxhr/pcxhr.c index f679779d96e..dafa2235aba 100644 --- a/sound/pci/pcxhr/pcxhr.c +++ b/sound/pci/pcxhr/pcxhr.c @@ -73,7 +73,7 @@ enum { PCI_ID_LAST }; -static struct pci_device_id pcxhr_ids[] = { +static struct pci_device_id pcxhr_ids[] __devinitdata = { { 0x10b5, 0x9656, 0x1369, 0xb001, 0, 0, PCI_ID_VX882HR, }, /* VX882HR */ { 0x10b5, 0x9656, 0x1369, 0xb101, 0, 0, PCI_ID_PCX882HR, }, /* PCX882HR */ { 0x10b5, 0x9656, 0x1369, 0xb201, 0, 0, PCI_ID_VX881HR, }, /* VX881HR */ -- cgit v1.2.3