mirror of
https://github.com/torvalds/linux.git
synced 2024-11-27 06:31:52 +00:00
input: hp680_ts_input: ctrl_in/outX to __raw_read/writeX conversion.
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:
parent
0af2840892
commit
e28abafbab
@ -28,29 +28,29 @@ static void do_softint(struct work_struct *work)
|
||||
u8 scpdr;
|
||||
int touched = 0;
|
||||
|
||||
if (ctrl_inb(PHDR) & PHDR_TS_PEN_DOWN) {
|
||||
scpdr = ctrl_inb(SCPDR);
|
||||
if (__raw_readb(PHDR) & PHDR_TS_PEN_DOWN) {
|
||||
scpdr = __raw_readb(SCPDR);
|
||||
scpdr |= SCPDR_TS_SCAN_ENABLE;
|
||||
scpdr &= ~SCPDR_TS_SCAN_Y;
|
||||
ctrl_outb(scpdr, SCPDR);
|
||||
__raw_writeb(scpdr, SCPDR);
|
||||
udelay(30);
|
||||
|
||||
absy = adc_single(ADC_CHANNEL_TS_Y);
|
||||
|
||||
scpdr = ctrl_inb(SCPDR);
|
||||
scpdr = __raw_readb(SCPDR);
|
||||
scpdr |= SCPDR_TS_SCAN_Y;
|
||||
scpdr &= ~SCPDR_TS_SCAN_X;
|
||||
ctrl_outb(scpdr, SCPDR);
|
||||
__raw_writeb(scpdr, SCPDR);
|
||||
udelay(30);
|
||||
|
||||
absx = adc_single(ADC_CHANNEL_TS_X);
|
||||
|
||||
scpdr = ctrl_inb(SCPDR);
|
||||
scpdr = __raw_readb(SCPDR);
|
||||
scpdr |= SCPDR_TS_SCAN_X;
|
||||
scpdr &= ~SCPDR_TS_SCAN_ENABLE;
|
||||
ctrl_outb(scpdr, SCPDR);
|
||||
__raw_writeb(scpdr, SCPDR);
|
||||
udelay(100);
|
||||
touched = ctrl_inb(PHDR) & PHDR_TS_PEN_DOWN;
|
||||
touched = __raw_readb(PHDR) & PHDR_TS_PEN_DOWN;
|
||||
}
|
||||
|
||||
if (touched) {
|
||||
|
Loading…
Reference in New Issue
Block a user