Merge tag 'hwspinlock-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad...

[karo-tx-linux.git] / sound / soc / au1x / psc.h

diff --git a/sound/soc/au1x/psc.h b/sound/soc/au1x/psc.h
index b16b2e02e0c9dec6dac5450ab922255059ee2283..74dffeb641fa78855f62c75ba8b8524786aa1028 100644 (file)
--- a/sound/soc/au1x/psc.h
+++ b/sound/soc/au1x/psc.h
@@ -27,16 +27,16 @@ struct au1xpsc_audio_data {
 };
 
 /* easy access macros */
-#define PSC_CTRL(x)    ((unsigned long)((x)->mmio) + PSC_CTRL_OFFSET)
-#define PSC_SEL(x)     ((unsigned long)((x)->mmio) + PSC_SEL_OFFSET)
-#define I2S_STAT(x)    ((unsigned long)((x)->mmio) + PSC_I2SSTAT_OFFSET)
-#define I2S_CFG(x)     ((unsigned long)((x)->mmio) + PSC_I2SCFG_OFFSET)
-#define I2S_PCR(x)     ((unsigned long)((x)->mmio) + PSC_I2SPCR_OFFSET)
-#define AC97_CFG(x)    ((unsigned long)((x)->mmio) + PSC_AC97CFG_OFFSET)
-#define AC97_CDC(x)    ((unsigned long)((x)->mmio) + PSC_AC97CDC_OFFSET)
-#define AC97_EVNT(x)   ((unsigned long)((x)->mmio) + PSC_AC97EVNT_OFFSET)
-#define AC97_PCR(x)    ((unsigned long)((x)->mmio) + PSC_AC97PCR_OFFSET)
-#define AC97_RST(x)    ((unsigned long)((x)->mmio) + PSC_AC97RST_OFFSET)
-#define AC97_STAT(x)   ((unsigned long)((x)->mmio) + PSC_AC97STAT_OFFSET)
+#define PSC_CTRL(x)    ((x)->mmio + PSC_CTRL_OFFSET)
+#define PSC_SEL(x)     ((x)->mmio + PSC_SEL_OFFSET)
+#define I2S_STAT(x)    ((x)->mmio + PSC_I2SSTAT_OFFSET)
+#define I2S_CFG(x)     ((x)->mmio + PSC_I2SCFG_OFFSET)
+#define I2S_PCR(x)     ((x)->mmio + PSC_I2SPCR_OFFSET)
+#define AC97_CFG(x)    ((x)->mmio + PSC_AC97CFG_OFFSET)
+#define AC97_CDC(x)    ((x)->mmio + PSC_AC97CDC_OFFSET)
+#define AC97_EVNT(x)   ((x)->mmio + PSC_AC97EVNT_OFFSET)
+#define AC97_PCR(x)    ((x)->mmio + PSC_AC97PCR_OFFSET)
+#define AC97_RST(x)    ((x)->mmio + PSC_AC97RST_OFFSET)
+#define AC97_STAT(x)   ((x)->mmio + PSC_AC97STAT_OFFSET)
 
 #endif