Skip to contentSkip to conversation

W1 patches for 2.6.18-rc1

PATCH New Greg KH 3 participants 5 messages Jul 12, 2006 – Jul 13, 2006 W1 dallas's 1-wire bus

lore
Share & tools
lore

Greg KH

author
#0 lore raw

PATCH 1/1 W1 patches for 2.6.18-rc1

Here are some tiny w1 patches that have been in the -mm tree for a while. They fix a bug, remove an unneeded .h file, and update the
MAINTAINERS file.

Please pull from:

	git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/w1-2.6.git/
or from:
	master.kernel.org:/pub/scm/linux/kernel/git/gregkh/w1-2.6.git/

if it isn't synced up yet.

The full patch series will sent to the linux-kernel mailing list, if anyone wants to see them.

thanks,

greg k-h

 MAINTAINERS                 |    1 -
 drivers/w1/masters/ds2482.c |    2 +-
 drivers/w1/w1_io.h          |   36 ------------------------------------
 3 files changed, 1 insertions(+), 38 deletions(-)
 delete mode 100644 drivers/w1/w1_io.h

---------------

Adrian Bunk:

      w1: remove drivers/w1/w1.h

Ben Gardner:
w1: fix idle check loop in ds2482

Evgeniy Polyakov:
W1: remove w1 mail list from lm_sensors.

#1 lore raw

PATCH 1/3 W1: remove w1 mail list from lm_sensors.

From: Evgeniy Polyakov <[email protected]>

lm_sensors mail list is going to be splitted into separate subdev lists, so remove w1 from there.

http://lists.lm-sensors.org/pipermail/lm-sensors/2006-June/016507.html

Signed-off-by Evgeniy Polyakov <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 MAINTAINERS |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
MAINTAINERS +0 -1
index 645a9f8..491e034 100644
@@ -3180,7 +3180,6 @@ S:	Maintained
 W1 DALLAS'S 1-WIRE BUS
 P:	Evgeniy Polyakov
 M:	[email protected]
-L:	[email protected]
 S:	Maintained
 
 W83L51xD SD/MMC CARD INTERFACE DRIVER
Signature · 1 line
1.4.1
#2 lore raw

PATCH 2/3 w1: fix idle check loop in ds2482

From: Ben Gardner <[email protected]>

The idle check loop has a greater-than where it should have a less-than. This causes the ds2482 driver to check for the idle condition exactly once, which causes it to fail on faster machines.

Signed-off-by Ben Gardner <[email protected]>
Signed-off-by Evgeniy Polyakov <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 drivers/w1/masters/ds2482.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/w1/masters/ds2482.c +1 -1
index af492cc..d93eb62 100644
@@ -218,7 +218,7 @@ static int ds2482_wait_1wire_idle(struct
 		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)
Signature · 1 line
1.4.1
#3 lore raw

PATCH 3/3 w1: remove drivers/w1/w1.h

From: Adrian Bunk <[email protected]>

drivers/w1/w1_io.h is both a subset of drivers/w1/w1.h and no longer #include'd by any file.

This patch therefore removes w1_io.h.

Signed-off-by Adrian Bunk <[email protected]>
Signed-off-by Evgeniy Polyakov <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 drivers/w1/w1_io.h |   36 ------------------------------------
 1 files changed, 0 insertions(+), 36 deletions(-)
drivers/w1/w1_io.h deleted +0 -36
deleted file mode 100644
index 9a76d2a..0000000
@@ -1,36 +0,0 @@
-/*
- *	w1_io.h
- *
- * Copyright (c) 2004 Evgeniy Polyakov <[email protected]>
- *
- *
- * 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 */
Signature · 1 line
1.4.1
#4 lore raw

Re: [PATCH 3/3] [PATCH] w1: remove drivers/w1/w1.h

Quoted 6 lines · Greg KH

From: Adrian Bunk <[email protected]>

drivers/w1/w1_io.h is both a subset of drivers/w1/w1.h and no longer #include'd by any file.

This patch therefore removes w1_io.h.

Minor nit, that's not what the subject says.

Thanks,
Nish