CVS commit: src/sys/dev/i2c

[Christoph Egger]

Module Name:    src
Committed By:   cegger
Date:           Tue May 12 14:23:33 UTC 2009

Modified Files:
        src/sys/dev/i2c: adm1021.c dbcool_var.h

Log Message:
struct device * -> device_t, no functional changes intended.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/i2c/adm1021.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/i2c/dbcool_var.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/i2c/adm1021.c
diff -u src/sys/dev/i2c/adm1021.c:1.1 src/sys/dev/i2c/adm1021.c:1.2
--- src/sys/dev/i2c/adm1021.c:1.1	Wed Oct 29 17:26:56 2008
+++ src/sys/dev/i2c/adm1021.c	Tue May 12 14:23:33 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: adm1021.c,v 1.1 2008/10/29 17:26:56 jkunz Exp $ */
+/*	$NetBSD: adm1021.c,v 1.2 2009/05/12 14:23:33 cegger Exp $ */
 /*	$OpenBSD: adm1021.c,v 1.27 2007/06/24 05:34:35 dlg Exp $	*/
 
 /*
@@ -18,7 +18,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adm1021.c,v 1.1 2008/10/29 17:26:56 jkunz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adm1021.c,v 1.2 2009/05/12 14:23:33 cegger Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -55,8 +55,8 @@
 	envsys_data_t sc_sensor[ADMTEMP_NUM_SENSORS];
 };
 
-int	admtemp_match(struct device *, cfdata_t, void *);
-void	admtemp_attach(struct device *, struct device *, void *);
+int	admtemp_match(device_t, cfdata_t, void *);
+void	admtemp_attach(device_t, device_t, void *);
 void	admtemp_refresh(struct sysmon_envsys *, envsys_data_t *);
 
 CFATTACH_DECL_NEW(admtemp, sizeof(struct admtemp_softc),
@@ -64,7 +64,7 @@
 
 
 int
-admtemp_match(struct device *parent, cfdata_t match, void *aux)
+admtemp_match(device_t parent, cfdata_t match, void *aux)
 {
 	struct i2c_attach_args *ia = aux;
 
@@ -78,7 +78,7 @@
 
 
 void
-admtemp_attach(struct device *parent, struct device *self, void *aux)
+admtemp_attach(device_t parent, device_t self, void *aux)
 {
 	struct admtemp_softc *sc = device_private(self);
 	struct i2c_attach_args *ia = aux;

Index: src/sys/dev/i2c/dbcool_var.h
diff -u src/sys/dev/i2c/dbcool_var.h:1.4 src/sys/dev/i2c/dbcool_var.h:1.5
--- src/sys/dev/i2c/dbcool_var.h:1.4	Sun Oct 12 12:49:04 2008
+++ src/sys/dev/i2c/dbcool_var.h	Tue May 12 14:23:33 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: dbcool_var.h,v 1.4 2008/10/12 12:49:04 pgoyette Exp $ */
+/*	$NetBSD: dbcool_var.h,v 1.5 2009/05/12 14:23:33 cegger Exp $ */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
 */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dbcool_var.h,v 1.4 2008/10/12 12:49:04 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbcool_var.h,v 1.5 2009/05/12 14:23:33 cegger Exp $");
 
 #include <dev/i2c/i2cvar.h>
 
@@ -106,7 +106,7 @@
 struct chip_id;
 
 struct dbcool_softc {
-	struct device *sc_dev;
+	device_t sc_dev;
 	i2c_tag_t sc_tag;
 	i2c_addr_t sc_addr;
 	struct chip_id *sc_chip;