diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2005-09-28 19:36:10 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-29 11:46:27 -0400 |
| commit | be88ec74cb48d1f60d0c0f059843f846f4481d87 (patch) | |
| tree | b5e8a093f5a66f17d34b748022073293736e2f05 /drivers/video/i810/i810-i2c.c | |
| parent | a7625d6e49cb4fd94be7576d85422c33003101b7 (diff) | |
[PATCH] i810-i2c iomem annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Acked-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video/i810/i810-i2c.c')
| -rw-r--r-- | drivers/video/i810/i810-i2c.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/video/i810/i810-i2c.c b/drivers/video/i810/i810-i2c.c index fda53aac1fc1..689d2586366d 100644 --- a/drivers/video/i810/i810-i2c.c +++ b/drivers/video/i810/i810-i2c.c | |||
| @@ -44,7 +44,7 @@ static void i810i2c_setscl(void *data, int state) | |||
| 44 | { | 44 | { |
| 45 | struct i810fb_i2c_chan *chan = (struct i810fb_i2c_chan *)data; | 45 | struct i810fb_i2c_chan *chan = (struct i810fb_i2c_chan *)data; |
| 46 | struct i810fb_par *par = chan->par; | 46 | struct i810fb_par *par = chan->par; |
| 47 | u8 *mmio = par->mmio_start_virtual; | 47 | u8 __iomem *mmio = par->mmio_start_virtual; |
| 48 | 48 | ||
| 49 | i810_writel(mmio, GPIOB, (state ? SCL_VAL_OUT : 0) | SCL_DIR | | 49 | i810_writel(mmio, GPIOB, (state ? SCL_VAL_OUT : 0) | SCL_DIR | |
| 50 | SCL_DIR_MASK | SCL_VAL_MASK); | 50 | SCL_DIR_MASK | SCL_VAL_MASK); |
| @@ -55,7 +55,7 @@ static void i810i2c_setsda(void *data, int state) | |||
| 55 | { | 55 | { |
| 56 | struct i810fb_i2c_chan *chan = (struct i810fb_i2c_chan *)data; | 56 | struct i810fb_i2c_chan *chan = (struct i810fb_i2c_chan *)data; |
| 57 | struct i810fb_par *par = chan->par; | 57 | struct i810fb_par *par = chan->par; |
| 58 | u8 *mmio = par->mmio_start_virtual; | 58 | u8 __iomem *mmio = par->mmio_start_virtual; |
| 59 | 59 | ||
| 60 | i810_writel(mmio, GPIOB, (state ? SDA_VAL_OUT : 0) | SDA_DIR | | 60 | i810_writel(mmio, GPIOB, (state ? SDA_VAL_OUT : 0) | SDA_DIR | |
| 61 | SDA_DIR_MASK | SDA_VAL_MASK); | 61 | SDA_DIR_MASK | SDA_VAL_MASK); |
| @@ -66,7 +66,7 @@ static int i810i2c_getscl(void *data) | |||
| 66 | { | 66 | { |
| 67 | struct i810fb_i2c_chan *chan = (struct i810fb_i2c_chan *)data; | 67 | struct i810fb_i2c_chan *chan = (struct i810fb_i2c_chan *)data; |
| 68 | struct i810fb_par *par = chan->par; | 68 | struct i810fb_par *par = chan->par; |
| 69 | u8 *mmio = par->mmio_start_virtual; | 69 | u8 __iomem *mmio = par->mmio_start_virtual; |
| 70 | 70 | ||
| 71 | i810_writel(mmio, GPIOB, SCL_DIR_MASK); | 71 | i810_writel(mmio, GPIOB, SCL_DIR_MASK); |
| 72 | i810_writel(mmio, GPIOB, 0); | 72 | i810_writel(mmio, GPIOB, 0); |
| @@ -77,7 +77,7 @@ static int i810i2c_getsda(void *data) | |||
| 77 | { | 77 | { |
| 78 | struct i810fb_i2c_chan *chan = (struct i810fb_i2c_chan *)data; | 78 | struct i810fb_i2c_chan *chan = (struct i810fb_i2c_chan *)data; |
| 79 | struct i810fb_par *par = chan->par; | 79 | struct i810fb_par *par = chan->par; |
| 80 | u8 *mmio = par->mmio_start_virtual; | 80 | u8 __iomem *mmio = par->mmio_start_virtual; |
| 81 | 81 | ||
| 82 | i810_writel(mmio, GPIOB, SDA_DIR_MASK); | 82 | i810_writel(mmio, GPIOB, SDA_DIR_MASK); |
| 83 | i810_writel(mmio, GPIOB, 0); | 83 | i810_writel(mmio, GPIOB, 0); |
| @@ -88,7 +88,7 @@ static void i810ddc_setscl(void *data, int state) | |||
| 88 | { | 88 | { |
| 89 | struct i810fb_i2c_chan *chan = (struct i810fb_i2c_chan *)data; | 89 | struct i810fb_i2c_chan *chan = (struct i810fb_i2c_chan *)data; |
| 90 | struct i810fb_par *par = chan->par; | 90 | struct i810fb_par *par = chan->par; |
| 91 | u8 *mmio = par->mmio_start_virtual; | 91 | u8 __iomem *mmio = par->mmio_start_virtual; |
| 92 | 92 | ||
| 93 | i810_writel(mmio, GPIOA, (state ? SCL_VAL_OUT : 0) | SCL_DIR | | 93 | i810_writel(mmio, GPIOA, (state ? SCL_VAL_OUT : 0) | SCL_DIR | |
| 94 | SCL_DIR_MASK | SCL_VAL_MASK); | 94 | SCL_DIR_MASK | SCL_VAL_MASK); |
| @@ -99,7 +99,7 @@ static void i810ddc_setsda(void *data, int state) | |||
| 99 | { | 99 | { |
| 100 | struct i810fb_i2c_chan *chan = (struct i810fb_i2c_chan *)data; | 100 | struct i810fb_i2c_chan *chan = (struct i810fb_i2c_chan *)data; |
| 101 | struct i810fb_par *par = chan->par; | 101 | struct i810fb_par *par = chan->par; |
| 102 | u8 *mmio = par->mmio_start_virtual; | 102 | u8 __iomem *mmio = par->mmio_start_virtual; |
| 103 | 103 | ||
| 104 | i810_writel(mmio, GPIOA, (state ? SDA_VAL_OUT : 0) | SDA_DIR | | 104 | i810_writel(mmio, GPIOA, (state ? SDA_VAL_OUT : 0) | SDA_DIR | |
| 105 | SDA_DIR_MASK | SDA_VAL_MASK); | 105 | SDA_DIR_MASK | SDA_VAL_MASK); |
| @@ -110,7 +110,7 @@ static int i810ddc_getscl(void *data) | |||
| 110 | { | 110 | { |
| 111 | struct i810fb_i2c_chan *chan = (struct i810fb_i2c_chan *)data; | 111 | struct i810fb_i2c_chan *chan = (struct i810fb_i2c_chan *)data; |
| 112 | struct i810fb_par *par = chan->par; | 112 | struct i810fb_par *par = chan->par; |
| 113 | u8 *mmio = par->mmio_start_virtual; | 113 | u8 __iomem *mmio = par->mmio_start_virtual; |
| 114 | 114 | ||
| 115 | i810_writel(mmio, GPIOA, SCL_DIR_MASK); | 115 | i810_writel(mmio, GPIOA, SCL_DIR_MASK); |
| 116 | i810_writel(mmio, GPIOA, 0); | 116 | i810_writel(mmio, GPIOA, 0); |
| @@ -121,7 +121,7 @@ static int i810ddc_getsda(void *data) | |||
| 121 | { | 121 | { |
| 122 | struct i810fb_i2c_chan *chan = (struct i810fb_i2c_chan *)data; | 122 | struct i810fb_i2c_chan *chan = (struct i810fb_i2c_chan *)data; |
| 123 | struct i810fb_par *par = chan->par; | 123 | struct i810fb_par *par = chan->par; |
| 124 | u8 *mmio = par->mmio_start_virtual; | 124 | u8 __iomem *mmio = par->mmio_start_virtual; |
| 125 | 125 | ||
| 126 | i810_writel(mmio, GPIOA, SDA_DIR_MASK); | 126 | i810_writel(mmio, GPIOA, SDA_DIR_MASK); |
| 127 | i810_writel(mmio, GPIOA, 0); | 127 | i810_writel(mmio, GPIOA, 0); |