diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-12 21:16:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-12 21:16:32 -0700 |
| commit | 7f0852f959d8e92786c684ebd7fee3332a2f4efe (patch) | |
| tree | 0fc9278f4094ba5e9c84c3c22608469f77393a2e | |
| parent | 2f1b9250516aa8744496abbbbb8a6066cb2b56db (diff) | |
| parent | f01cfb3638a2f1ee584913f37e5ba7a8abfed8de (diff) | |
Merge commit master.kernel.org:/pub/scm/linux/kernel/git/gregkh/w1-2.6 of HEAD
* HEAD:
[PATCH] w1: remove drivers/w1/w1.h
[PATCH] w1: fix idle check loop in ds2482
[PATCH] W1: remove w1 mail list from lm_sensors.
| -rw-r--r-- | MAINTAINERS | 1 | ||||
| -rw-r--r-- | drivers/w1/masters/ds2482.c | 2 | ||||
| -rw-r--r-- | drivers/w1/w1_io.h | 36 |
3 files changed, 1 insertions, 38 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 645a9f85f33..491e034f347 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3180,7 +3180,6 @@ S: Maintained W1 DALLAS'S 1-WIRE BUS P: Evgeniy Polyakov M: johnpol@2ka.mipt.ru -L: lm-sensors@lm-sensors.org S: Maintained W83L51xD SD/MMC CARD INTERFACE DRIVER diff --git a/drivers/w1/masters/ds2482.c b/drivers/w1/masters/ds2482.c index af492cc48db..d93eb626b2f 100644 --- a/drivers/w1/masters/ds2482.c +++ b/drivers/w1/masters/ds2482.c @@ -218,7 +218,7 @@ static int ds2482_wait_1wire_idle(struct ds2482_data *pdev) do { temp = i2c_smbus_read_byte(&pdev->client); } while ((temp >= 0) && (temp & DS2482_REG_STS_1WB) && - (++retries > DS2482_WAIT_IDLE_TIMEOUT)); + (++retries < DS2482_WAIT_IDLE_TIMEOUT)); } if (retries > DS2482_WAIT_IDLE_TIMEOUT) diff --git a/drivers/w1/w1_io.h b/drivers/w1/w1_io.h deleted file mode 100644 index 9a76d2ad69c..00000000000 --- a/drivers/w1/w1_io.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * w1_io.h - * - * Copyright (c) 2004 Evgeniy Polyakov <johnpol@2ka.mipt.ru> - * - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef __W1_IO_H -#define __W1_IO_H - -#include "w1.h" - -u8 w1_triplet(struct w1_master *dev, int bdir); -void w1_write_8(struct w1_master *, u8); -int w1_reset_bus(struct w1_master *); -u8 w1_calc_crc8(u8 *, int); -void w1_write_block(struct w1_master *, const u8 *, int); -u8 w1_read_block(struct w1_master *, u8 *, int); -void w1_search_devices(struct w1_master *dev, w1_slave_found_callback cb); -int w1_reset_select_slave(struct w1_slave *sl); - -#endif /* __W1_IO_H */ |