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

w1: mxc_w1: Enable driver compilation with COMPILE_TEST

Browse Source 
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>
This commit is contained in:
Alexander Shiyan 2014-02-22 11:29:51 +04:00 committed by Greg Kroah-Hartman
parent 18fd9e359f
commit fc945d6eb7
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/w1/masters/Kconfig
View File

@ -36,7 +36,7 @@ config W1_MASTER_DS2482
config W1_MASTER_MXC config W1_MASTER_MXC
tristate "Freescale MXC 1-wire busmaster" tristate "Freescale MXC 1-wire busmaster"
depends on ARCH_MXC depends on ARCH_MXC || COMPILE_TEST
help help
Say Y here to enable MXC 1-wire host Say Y here to enable MXC 1-wire host

12
drivers/w1/masters/mxc_w1.c
View File

@ -53,10 +53,10 @@ static u8 mxc_w1_ds2_reset_bus(void *data)
unsigned int timeout_cnt = 0; unsigned int timeout_cnt = 0;
struct mxc_w1_device *dev = data; 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) { 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) || if (!(reg_val & MXC_W1_CONTROL_RPP) ||
timeout_cnt > MXC_W1_RESET_TIMEOUT) timeout_cnt > MXC_W1_RESET_TIMEOUT)
@ -82,16 +82,16 @@ static u8 mxc_w1_ds2_touch_bit(void *data, u8 bit)
* datasheet. * datasheet.
*/ */
__raw_writeb(MXC_W1_CONTROL_WR(bit), ctrl_addr); writeb(MXC_W1_CONTROL_WR(bit), ctrl_addr);
while (timeout_cnt--) { while (timeout_cnt--) {
if (!(__raw_readb(ctrl_addr) & MXC_W1_CONTROL_WR(bit))) if (!(readb(ctrl_addr) & MXC_W1_CONTROL_WR(bit)))
break; break;
udelay(1); 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) static int mxc_w1_probe(struct platform_device *pdev)
@ -131,7 +131,7 @@ static int mxc_w1_probe(struct platform_device *pdev)
if (err) if (err)
return 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.data = mdev;
mdev->bus_master.reset_bus = mxc_w1_ds2_reset_bus; mdev->bus_master.reset_bus = mxc_w1_ds2_reset_bus;