[2.6 patch] remove drivers/w1/w1_io.h

[2.6 patch] remove drivers/w1/w1_io.h

[Adrian Bunk]

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 <bunk@stusta.de>

---

 drivers/w1/w1_io.h |   36 ------------------------------------
 1 file changed, 36 deletions(-)

--- linux-2.6.17-mm3-full/drivers/w1/w1_io.h	2006-06-27 11:04:12.000000000 +0200
+++ /dev/null	2006-04-23 00:42:46.000000000 +0200
@@ -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 */

Re: [2.6 patch] remove drivers/w1/w1_io.h

[Evgeniy Polyakov]

On Wed, Jun 28, 2006 at 06:55:22PM +0200, Adrian Bunk (bunk@stusta.de) wrote:
> 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 <bunk@stusta.de>

Your patch is correct, thank you Adrian.
I will push it upstrem soon.

> ---
> 
>  drivers/w1/w1_io.h |   36 ------------------------------------
>  1 file changed, 36 deletions(-)
> 
> --- linux-2.6.17-mm3-full/drivers/w1/w1_io.h	2006-06-27 11:04:12.000000000 +0200
> +++ /dev/null	2006-04-23 00:42:46.000000000 +0200
> @@ -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 */

-- 
	Evgeniy Polyakov