svn commit: r188173 - head/sys/dev/ppc

[Warner Losh]

Author: imp
Date: Thu Feb  5 19:31:55 2009
New Revision: 188173
URL: http://svn.freebsd.org/changeset/base/188173

Log:
  reset_epp and ecp_sync both return int.

Modified:
  head/sys/dev/ppc/ppc.c
  head/sys/dev/ppc/ppcvar.h

Modified: head/sys/dev/ppc/ppc.c
==============================================================================
--- head/sys/dev/ppc/ppc.c	Thu Feb  5 19:30:55 2009	(r188172)
+++ head/sys/dev/ppc/ppc.c	Thu Feb  5 19:31:55 2009	(r188173)
@@ -115,7 +115,7 @@ static char *ppc_epp_protocol[] = { " (E
 /*
  * ppc_ecp_sync()		XXX
  */
-void
+int
 ppc_ecp_sync(device_t dev)
 {
 	int i, r;
@@ -123,22 +123,22 @@ ppc_ecp_sync(device_t dev)
 
 	PPC_ASSERT_LOCKED(ppc);
 	if (!(ppc->ppc_avm & PPB_ECP) && !(ppc->ppc_dtm & PPB_ECP))
-		return;
+		return 0;
 
 	r = r_ecr(ppc);
 	if ((r & 0xe0) != PPC_ECR_EPP)
-		return;
+		return 0;
 
 	for (i = 0; i < 100; i++) {
 		r = r_ecr(ppc);
 		if (r & 0x1)
-			return;
+			return 0;
 		DELAY(100);
 	}
 
 	device_printf(dev, "ECP sync failed as data still present in FIFO.\n");
 
-	return;
+	return 0;
 }
 
 /*
@@ -1613,7 +1613,7 @@ ppc_write(device_t dev, char *buf, int l
 	return (EINVAL);
 }
 
-void
+int
 ppc_reset_epp(device_t dev)
 {
 	struct ppc_data *ppc = DEVTOSOFTC(dev);
@@ -1621,7 +1621,7 @@ ppc_reset_epp(device_t dev)
 	PPC_ASSERT_LOCKED(ppc);
 	ppc_reset_epp_timeout(ppc);
 
-	return;
+	return 0;
 }
 
 int

Modified: head/sys/dev/ppc/ppcvar.h
==============================================================================
--- head/sys/dev/ppc/ppcvar.h	Thu Feb  5 19:30:55 2009	(r188172)
+++ head/sys/dev/ppc/ppcvar.h	Thu Feb  5 19:31:55 2009	(r188173)
@@ -44,8 +44,8 @@ struct resource *ppc_alloc_resource(devi
     int *rid, u_long start, u_long end, u_long count, u_int flags);
 int ppc_release_resource(device_t bus, device_t child, int type, int rid,
     struct resource *r);
-void ppc_reset_epp(device_t);
-void ppc_ecp_sync(device_t);
+int ppc_reset_epp(device_t);
+int ppc_ecp_sync(device_t);
 int ppc_setmode(device_t, int);
 
 extern devclass_t ppc_devclass;