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

input: hp680_ts_input: ctrl_in/outX to __raw_read/writeX conversion.

Browse Source 
The ctrl_xxx routines are deprecated, switch over to the __raw_xxx
versions.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Paul Mundt 2010-10-27 15:25:42 +09:00
parent 0af2840892
commit e28abafbab
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/input/touchscreen/hp680_ts_input.c
View File

@ -28,29 +28,29 @@ static void do_softint(struct work_struct *work)
u8 scpdr; u8 scpdr;
int touched = 0; int touched = 0;
if (ctrl_inb(PHDR) & PHDR_TS_PEN_DOWN) { if (__raw_readb(PHDR) & PHDR_TS_PEN_DOWN) {
scpdr = ctrl_inb(SCPDR); scpdr = __raw_readb(SCPDR);
scpdr |= SCPDR_TS_SCAN_ENABLE; scpdr |= SCPDR_TS_SCAN_ENABLE;
scpdr &= ~SCPDR_TS_SCAN_Y; scpdr &= ~SCPDR_TS_SCAN_Y;
ctrl_outb(scpdr, SCPDR); __raw_writeb(scpdr, SCPDR);
udelay(30); udelay(30);
absy = adc_single(ADC_CHANNEL_TS_Y); absy = adc_single(ADC_CHANNEL_TS_Y);
scpdr = ctrl_inb(SCPDR); scpdr = __raw_readb(SCPDR);
scpdr |= SCPDR_TS_SCAN_Y; scpdr |= SCPDR_TS_SCAN_Y;
scpdr &= ~SCPDR_TS_SCAN_X; scpdr &= ~SCPDR_TS_SCAN_X;
ctrl_outb(scpdr, SCPDR); __raw_writeb(scpdr, SCPDR);
udelay(30); udelay(30);
absx = adc_single(ADC_CHANNEL_TS_X); absx = adc_single(ADC_CHANNEL_TS_X);
scpdr = ctrl_inb(SCPDR); scpdr = __raw_readb(SCPDR);
scpdr |= SCPDR_TS_SCAN_X; scpdr |= SCPDR_TS_SCAN_X;
scpdr &= ~SCPDR_TS_SCAN_ENABLE; scpdr &= ~SCPDR_TS_SCAN_ENABLE;
ctrl_outb(scpdr, SCPDR); __raw_writeb(scpdr, SCPDR);
udelay(100); udelay(100);
touched = ctrl_inb(PHDR) & PHDR_TS_PEN_DOWN; touched = __raw_readb(PHDR) & PHDR_TS_PEN_DOWN;
} }
if (touched) { if (touched) {