X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sound%2Fppc%2Fpmac.h;h=a699b01210ee116c585b20d2727cd9bbcfeb1a44;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=9521a4106dc85404d50114750c4960ac2f21e848;hpb=c7b5ebbddf7bcd3651947760f423e3783bbe6573;p=linux-2.6.git

diff --git a/sound/ppc/pmac.h b/sound/ppc/pmac.h
index 9521a4106..a699b0121 100644
--- a/sound/ppc/pmac.h
+++ b/sound/ppc/pmac.h
@@ -61,7 +61,7 @@ typedef struct snd_pmac_dbdma pmac_dbdma_t;
  */
 struct snd_pmac_dbdma {
 	unsigned long addr;
-	struct dbdma_cmd *cmds;
+	struct dbdma_cmd __iomem *cmds;
 	void *space;
 	int size;
 };
@@ -80,7 +80,7 @@ struct snd_pmac_stream {
 	int nperiods, cur_period;
 
 	pmac_dbdma_t cmd;
-	volatile struct dbdma_regs *dma;
+	volatile struct dbdma_regs __iomem *dma;
 
 	snd_pcm_substream_t *substream;
 
@@ -130,12 +130,12 @@ struct snd_pmac {
 	int format;			/* current format */
 
 	spinlock_t reg_lock;
-	volatile struct awacs_regs *awacs;
+	volatile struct awacs_regs __iomem *awacs;
 	int awacs_reg[8]; /* register cache */
 	unsigned int hp_stat_mask;
 
-	unsigned char *latch_base;
-	unsigned char *macio_base;
+	unsigned char __iomem *latch_base;
+	unsigned char __iomem *macio_base;
 
 	pmac_stream_t playback;
 	pmac_stream_t capture;
@@ -199,8 +199,6 @@ typedef struct snd_pmac_keywest {
 
 int snd_pmac_keywest_init(pmac_keywest_t *i2c);
 void snd_pmac_keywest_cleanup(pmac_keywest_t *i2c);
-#define snd_pmac_keywest_write(i2c,cmd,len,data) i2c_smbus_write_block_data((i2c)->client, cmd, len, data)
-#define snd_pmac_keywest_write_byte(i2c,cmd,data) i2c_smbus_write_byte_data((i2c)->client, cmd, data)
 
 /* misc */
 int snd_pmac_boolean_stereo_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo);