openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ALSA: ctxfi: sparse warning 

fixed sparse warning of incorrect type (different address spaces) in
cthw20k1.c and cthw20k2.c which was being actually caused as mem_base
was of the type unsigned long.

Again as mem_base was previously unsigned long , so it required many
typecasts in the code to convert interger to pointer.

Now after giving the correct type of mem_base as void __iomem *
we can also remove those typecasts maintaining the same functionality
and logic of the code.

Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Sudip Mukherjee 2014-09-23 16:30:24 +05:30 committed by Takashi Iwai
parent 95f72cf2cd
commit 7a7686bd0d
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/pci/ctxfi/cthardware.h
View File

@ -186,7 +186,7 @@ struct hw {
struct pci_dev *pci; /* the pci kernel structure of this card */ struct pci_dev *pci; /* the pci kernel structure of this card */
int irq; int irq;
unsigned long io_base; unsigned long io_base;
unsigned long mem_base; void __iomem *mem_base;
enum CHIPTYP chip_type; enum CHIPTYP chip_type;
enum CTCARDS model; enum CTCARDS model;

6
sound/pci/ctxfi/cthw20k1.c
View File

@ -1802,7 +1802,7 @@ static int uaa_to_xfi(struct pci_dev *pci)
unsigned int is_uaa; unsigned int is_uaa;
unsigned int data[4] = {0}; unsigned int data[4] = {0};
unsigned int io_base; unsigned int io_base;
void *mem_base; void __iomem *mem_base;
int i; int i;
const u32 CTLX = CTLBITS('C', 'T', 'L', 'X'); const u32 CTLX = CTLBITS('C', 'T', 'L', 'X');
const u32 CTL_ = CTLBITS('C', 'T', 'L', '-'); const u32 CTL_ = CTLBITS('C', 'T', 'L', '-');
@ -1984,9 +1984,9 @@ static int hw_card_shutdown(struct hw *hw)
hw->irq = -1; hw->irq = -1;
if (hw->mem_base) if (hw->mem_base)
iounmap((void *)hw->mem_base); iounmap(hw->mem_base);
hw->mem_base = (unsigned long)NULL; hw->mem_base = NULL;
if (hw->io_base) if (hw->io_base)
pci_release_regions(hw->pci); pci_release_regions(hw->pci);

12
sound/pci/ctxfi/cthw20k2.c
View File

@ -2045,8 +2045,8 @@ static int hw_card_start(struct hw *hw)
goto error1; goto error1;
hw->io_base = pci_resource_start(hw->pci, 2); hw->io_base = pci_resource_start(hw->pci, 2);
hw->mem_base = (unsigned long)ioremap(hw->io_base, hw->mem_base = ioremap(hw->io_base,
pci_resource_len(hw->pci, 2)); pci_resource_len(hw->pci, 2));
if (!hw->mem_base) { if (!hw->mem_base) {
err = -ENOENT; err = -ENOENT;
goto error2; goto error2;
@ -2106,9 +2106,9 @@ static int hw_card_shutdown(struct hw *hw)
hw->irq = -1; hw->irq = -1;
if (hw->mem_base) if (hw->mem_base)
iounmap((void *)hw->mem_base); iounmap(hw->mem_base);
hw->mem_base = (unsigned long)NULL; hw->mem_base = NULL;
if (hw->io_base) if (hw->io_base)
pci_release_regions(hw->pci); pci_release_regions(hw->pci);
@ -2228,12 +2228,12 @@ static int hw_resume(struct hw *hw, struct card_conf *info)
static u32 hw_read_20kx(struct hw *hw, u32 reg) static u32 hw_read_20kx(struct hw *hw, u32 reg)
{ {
return readl((void *)(hw->mem_base + reg)); return readl(hw->mem_base + reg);
} }
static void hw_write_20kx(struct hw *hw, u32 reg, u32 data) static void hw_write_20kx(struct hw *hw, u32 reg, u32 data)
{ {
writel(data, (void *)(hw->mem_base + reg)); writel(data, hw->mem_base + reg);
} }
static struct hw ct20k2_preset = { static struct hw ct20k2_preset = {