Commit 7f0852f9 authored by Linus Torvalds's avatar Linus Torvalds

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.
parents 2f1b9250 f01cfb36
...@@ -3180,7 +3180,6 @@ S: Maintained ...@@ -3180,7 +3180,6 @@ S: Maintained
W1 DALLAS'S 1-WIRE BUS W1 DALLAS'S 1-WIRE BUS
P: Evgeniy Polyakov P: Evgeniy Polyakov
M: johnpol@2ka.mipt.ru M: johnpol@2ka.mipt.ru
L: lm-sensors@lm-sensors.org
S: Maintained S: Maintained
W83L51xD SD/MMC CARD INTERFACE DRIVER W83L51xD SD/MMC CARD INTERFACE DRIVER
......
...@@ -218,7 +218,7 @@ static int ds2482_wait_1wire_idle(struct ds2482_data *pdev) ...@@ -218,7 +218,7 @@ static int ds2482_wait_1wire_idle(struct ds2482_data *pdev)
do { do {
temp = i2c_smbus_read_byte(&pdev->client); temp = i2c_smbus_read_byte(&pdev->client);
} while ((temp >= 0) && (temp & DS2482_REG_STS_1WB) && } while ((temp >= 0) && (temp & DS2482_REG_STS_1WB) &&
(++retries > DS2482_WAIT_IDLE_TIMEOUT)); (++retries < DS2482_WAIT_IDLE_TIMEOUT));
} }
if (retries > DS2482_WAIT_IDLE_TIMEOUT) if (retries > DS2482_WAIT_IDLE_TIMEOUT)
......
/*
* 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 */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment