iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

unicore32 i8042: adjust io funcs of i8042-unicore32io.h

Browse Source 
replace inb/outb with readb/writeb in i8042-unicore32io.h
and correct typecasting of register and region macros
  -- by advice with Arnd Bergmann

Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
This commit is contained in:
GuanXuetao 2011-02-18 18:38:33 +08:00
parent bd42aa75b4
commit 3838b82c0a
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/input/serio/i8042-unicore32io.h
View File

@ -29,33 +29,36 @@
/*
* Register numbers.
*/
#define I8042_COMMAND_REG ((unsigned long)&PS2_COMMAND)
#define I8042_STATUS_REG ((unsigned long)&PS2_STATUS)
#define I8042_DATA_REG ((unsigned long)&PS2_DATA)
#define I8042_COMMAND_REG ((volatile void __iomem *)&PS2_COMMAND)
#define I8042_STATUS_REG ((volatile void __iomem *)&PS2_STATUS)
#define I8042_DATA_REG ((volatile void __iomem *)&PS2_DATA)
#define I8042_REGION_START (resource_size_t)(&PS2_DATA)
#define I8042_REGION_SIZE (resource_size_t)(16)
static inline int i8042_read_data(void)
{
return inb(I8042_DATA_REG);
return readb(I8042_DATA_REG);
}
static inline int i8042_read_status(void)
{
return inb(I8042_STATUS_REG);
return readb(I8042_STATUS_REG);
}
static inline void i8042_write_data(int val)
{
outb(val, I8042_DATA_REG);
writeb(val, I8042_DATA_REG);
}
static inline void i8042_write_command(int val)
{
outb(val, I8042_COMMAND_REG);
writeb(val, I8042_COMMAND_REG);
}
static inline int i8042_platform_init(void)
{
if (!request_region(I8042_DATA_REG, 16, "i8042"))
if (!request_region(I8042_REGION_START, I8042_REGION_SIZE, "i8042"))
return -EBUSY;
i8042_reset = 1;
@ -64,7 +67,7 @@ static inline int i8042_platform_init(void)
static inline void i8042_platform_exit(void)
{
release_region(I8042_DATA_REG, 16);
release_region(I8042_REGION_START, I8042_REGION_SIZE);
}
#endif /* _I8042_UNICORE32_H */