diff options
author | Dylan Reid <dgreid@chromium.org> | 2014-03-02 23:44:01 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-03-03 03:53:28 -0500 |
commit | db291e36a4c511c0e95817b0083d78c66efbb4e0 (patch) | |
tree | 8c82f1649f07192e89d7a1cebf7d6fef5e57c0e9 /sound | |
parent | 778bde6f59e062a44df5e82646db71c9ef84c18a (diff) |
ALSA: hda - Mark reg op args as iomem
The ops to read and write registers should take pointers labeled as
__iomem. Thanks to the sparse bot for catching this.
Signed-off-by: Dylan Reid <dgreid@chromium.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/pci/hda/hda_intel.c | 12 | ||||
-rw-r--r-- | sound/pci/hda/hda_priv.h | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 149c00b00320..77ca894f8284 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c | |||
@@ -1431,32 +1431,32 @@ static void azx_firmware_cb(const struct firmware *fw, void *context) | |||
1431 | */ | 1431 | */ |
1432 | 1432 | ||
1433 | /* PCI register access. */ | 1433 | /* PCI register access. */ |
1434 | static void pci_azx_writel(u32 value, u32 *addr) | 1434 | static void pci_azx_writel(u32 value, u32 __iomem *addr) |
1435 | { | 1435 | { |
1436 | writel(value, addr); | 1436 | writel(value, addr); |
1437 | } | 1437 | } |
1438 | 1438 | ||
1439 | static u32 pci_azx_readl(u32 *addr) | 1439 | static u32 pci_azx_readl(u32 __iomem *addr) |
1440 | { | 1440 | { |
1441 | return readl(addr); | 1441 | return readl(addr); |
1442 | } | 1442 | } |
1443 | 1443 | ||
1444 | static void pci_azx_writew(u16 value, u16 *addr) | 1444 | static void pci_azx_writew(u16 value, u16 __iomem *addr) |
1445 | { | 1445 | { |
1446 | writew(value, addr); | 1446 | writew(value, addr); |
1447 | } | 1447 | } |
1448 | 1448 | ||
1449 | static u16 pci_azx_readw(u16 *addr) | 1449 | static u16 pci_azx_readw(u16 __iomem *addr) |
1450 | { | 1450 | { |
1451 | return readw(addr); | 1451 | return readw(addr); |
1452 | } | 1452 | } |
1453 | 1453 | ||
1454 | static void pci_azx_writeb(u8 value, u8 *addr) | 1454 | static void pci_azx_writeb(u8 value, u8 __iomem *addr) |
1455 | { | 1455 | { |
1456 | writeb(value, addr); | 1456 | writeb(value, addr); |
1457 | } | 1457 | } |
1458 | 1458 | ||
1459 | static u8 pci_azx_readb(u8 *addr) | 1459 | static u8 pci_azx_readb(u8 __iomem *addr) |
1460 | { | 1460 | { |
1461 | return readb(addr); | 1461 | return readb(addr); |
1462 | } | 1462 | } |
diff --git a/sound/pci/hda/hda_priv.h b/sound/pci/hda/hda_priv.h index 198fa825fa0e..ba38b819f984 100644 --- a/sound/pci/hda/hda_priv.h +++ b/sound/pci/hda/hda_priv.h | |||
@@ -290,12 +290,12 @@ struct azx; | |||
290 | /* Functions to read/write to hda registers. */ | 290 | /* Functions to read/write to hda registers. */ |
291 | struct hda_controller_ops { | 291 | struct hda_controller_ops { |
292 | /* Register Access */ | 292 | /* Register Access */ |
293 | void (*reg_writel)(u32 value, u32 *addr); | 293 | void (*reg_writel)(u32 value, u32 __iomem *addr); |
294 | u32 (*reg_readl)(u32 *addr); | 294 | u32 (*reg_readl)(u32 __iomem *addr); |
295 | void (*reg_writew)(u16 value, u16 *addr); | 295 | void (*reg_writew)(u16 value, u16 __iomem *addr); |
296 | u16 (*reg_readw)(u16 *addr); | 296 | u16 (*reg_readw)(u16 __iomem *addr); |
297 | void (*reg_writeb)(u8 value, u8 *addr); | 297 | void (*reg_writeb)(u8 value, u8 __iomem *addr); |
298 | u8 (*reg_readb)(u8 *addr); | 298 | u8 (*reg_readb)(u8 __iomem *addr); |
299 | /* Disable msi if supported, PCI only */ | 299 | /* Disable msi if supported, PCI only */ |
300 | int (*disable_msi_reset_irq)(struct azx *); | 300 | int (*disable_msi_reset_irq)(struct azx *); |
301 | /* Allocation ops */ | 301 | /* Allocation ops */ |