Skip to content

Commit

Permalink
w1: mxc_w1: Enable driver compilation with COMPILE_TEST
Browse files Browse the repository at this point in the history
This helps increasing build testing coverage.
To do this, __raw_{read,write}b() functions was be replaced with
simple {read,write}b() variants.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Alexander Shiyan authored and Greg Kroah-Hartman committed Feb 28, 2014
1 parent 18fd9e3 commit fc945d6
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion drivers/w1/masters/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ config W1_MASTER_DS2482

config W1_MASTER_MXC
tristate "Freescale MXC 1-wire busmaster"
depends on ARCH_MXC
depends on ARCH_MXC || COMPILE_TEST
help
Say Y here to enable MXC 1-wire host

Expand Down
12 changes: 6 additions & 6 deletions drivers/w1/masters/mxc_w1.c
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ static u8 mxc_w1_ds2_reset_bus(void *data)
unsigned int timeout_cnt = 0;
struct mxc_w1_device *dev = data;

__raw_writeb(MXC_W1_CONTROL_RPP, (dev->regs + MXC_W1_CONTROL));
writeb(MXC_W1_CONTROL_RPP, (dev->regs + MXC_W1_CONTROL));

while (1) {
reg_val = __raw_readb(dev->regs + MXC_W1_CONTROL);
reg_val = readb(dev->regs + MXC_W1_CONTROL);

if (!(reg_val & MXC_W1_CONTROL_RPP) ||
timeout_cnt > MXC_W1_RESET_TIMEOUT)
Expand All @@ -82,16 +82,16 @@ static u8 mxc_w1_ds2_touch_bit(void *data, u8 bit)
* datasheet.
*/

__raw_writeb(MXC_W1_CONTROL_WR(bit), ctrl_addr);
writeb(MXC_W1_CONTROL_WR(bit), ctrl_addr);

while (timeout_cnt--) {
if (!(__raw_readb(ctrl_addr) & MXC_W1_CONTROL_WR(bit)))
if (!(readb(ctrl_addr) & MXC_W1_CONTROL_WR(bit)))
break;

udelay(1);
}

return !!(__raw_readb(ctrl_addr) & MXC_W1_CONTROL_RDST);
return !!(readb(ctrl_addr) & MXC_W1_CONTROL_RDST);
}

static int mxc_w1_probe(struct platform_device *pdev)
Expand Down Expand Up @@ -131,7 +131,7 @@ static int mxc_w1_probe(struct platform_device *pdev)
if (err)
return err;

__raw_writeb(clkdiv - 1, mdev->regs + MXC_W1_TIME_DIVIDER);
writeb(clkdiv - 1, mdev->regs + MXC_W1_TIME_DIVIDER);

mdev->bus_master.data = mdev;
mdev->bus_master.reset_bus = mxc_w1_ds2_reset_bus;
Expand Down

0 comments on commit fc945d6

Please sign in to comment.