Skip to content

Commit

Permalink
input: hp680_ts_input: ctrl_in/outX to __raw_read/writeX conversion.
Browse files Browse the repository at this point in the history
The ctrl_xxx routines are deprecated, switch over to the __raw_xxx
versions.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  • Loading branch information
Paul Mundt committed Oct 27, 2010
1 parent 0af2840 commit e28abaf
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions drivers/input/touchscreen/hp680_ts_input.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit e28abaf

Please sign in to comment.