9os

commit 6b7bff0facdbf85b0cd9bf672b53a838e40984f4
parent a40b81b1c64504004d67f265b9284c7ca9f5f099
Author: Ambroise Vincent <ambroise.vincent@arm.com>
Date:   Tue, 14 May 2019 16:35:17 +0100

[dev] Rename channel close function

Change-Id: I8ed3d530a212fe3fa6bb8f6253d289850765e1c2
Signed-off-by: Ambroise Vincent <ambroise.vincent@arm.com>

Diffstat:
M
drivers/dev.c
 | 
28
++++++++++++++--------------
M
drivers/dev.h
 | 
3
++-
M
drivers/devar.c
 | 
2
+-
M
drivers/devcons.c
 | 
4
++--
M
drivers/devfip.c
 | 
2
+-

5 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/drivers/dev.c b/drivers/dev.c
@@ -20,7 +20,7 @@ static Chan slash;
 static mutex_t chanlock;
 static struct mpoint mpoints[NR_MPOINTS];
 
-static Chan *
+Chan *
 newchan(unsigned char type)
 {
 	Chan *c = NULL;
@@ -112,7 +112,7 @@ devtype(int c)
 }
 
 void
-chanclose(Chan *c)
+delchan(Chan *c)
 {
 	c->qid = 0;
 	c->dev = 0;
@@ -218,7 +218,7 @@ namec(const char *name, int mode)
 		if ((c->qid & CHDIR) == 0)
 			goto notfound;
 		if (devtab[c->type]->walk(c, elem) < 0) {
-			chanclose(c);
+			delchan(c);
 			return NULL;
 		}
 		mnt = mntpoint(c->type, c->qid);
@@ -232,7 +232,7 @@ namec(const char *name, int mode)
 	return c;
 
 notfound:
-	chanclose(c);
+	delchan(c);
 noent:
 	errno = ENOENT;
 	return NULL;
@@ -355,7 +355,7 @@ close(int fd)
 
 	if ((c = fd2chan(fd)) == NULL)
 		return -1;
-	chanclose(c);
+	delchan(c);
 	return 0;
 }
 
@@ -393,7 +393,7 @@ devstat(Chan *dirc, char *file,
 	}
 
 leave:
-	chanclose(c);
+	delchan(c);
 	return r;
 }
 
@@ -432,7 +432,7 @@ stat(char *path, void *buf, int n)
 		return -1;
 
 	r = devtab[c->type]->stat(c, path, buf, n);
-	chanclose(c);
+	delchan(c);
 
 	return r;
 }
@@ -510,7 +510,7 @@ sync(void)
         for (dp = devtab; *dp; ++dp) {
 		c = attach((*dp)->id, 0);
 		devtab[c->type]->sync(c, SYNCALL);
-		chanclose(c);
+		delchan(c);
 	}
 }
 
@@ -590,7 +590,7 @@ addmntpoint(Chan *c, char *new)
 	return 0;
 
 err1:
-	chanclose(cn);
+	delchan(cn);
 err0:
 	return -1;
 }
@@ -604,7 +604,7 @@ bind(char *old, char *new)
 		return -1;
 
 	if (addmntpoint(c, new) < 0) {
-		chanclose(c);
+		delchan(c);
 		return -1;
 	}
 
@@ -625,14 +625,14 @@ mount(char *srv, char *where, char *spec)
 
 	if (addmntpoint(c, where) < 0)
 		goto err2;
-	chanclose(cs);
+	delchan(cs);
 
 	return 0;
 
 err2:
-	chanclose(c);
+	delchan(c);
 err1:
-	chanclose(cs);
+	delchan(cs);
 err0:
 	return -1;
 }
@@ -651,6 +651,6 @@ idev(void)
 	if (!clone(c, &slash))
 		panic("idev:clone");
 
-	chanclose(c);
+	delchan(c);
 	devlink();
 }
diff --git a/drivers/dev.h b/drivers/dev.h
@@ -54,7 +54,8 @@ struct attr {
 extern Chan *namec(const char *name, int mode);
 extern Chan *clone(Chan *c, Chan *nc);
 extern Chan *attach(int id, int dev);
-extern void chanclose(Chan *c);
+extern Chan *newchan(unsigned char type);
+extern void delchan(Chan *c);
 extern int buf2chan(Chan *c,
                     void *dst, void *src,
                     int nbytes, long len);
diff --git a/drivers/devar.c b/drivers/devar.c
@@ -201,7 +201,7 @@ armount(Chan *c, char *spec)
 	errno = ENOMEM;
 
 err:
-	chanclose(cspec);
+	delchan(cspec);
 	return NULL;
 }
 
diff --git a/drivers/devcons.c b/drivers/devcons.c
@@ -125,7 +125,7 @@ consdelin(void *buf, int n)
 		return -1;
 	}
 
-	chanclose(in);
+	delchan(in);
 	in = NULL;
 	inname[0] = '\0';
 	return 0;
@@ -143,7 +143,7 @@ consdelout(void *buf, int n)
 
 	for (i = 0; i < CONSOUT; i++) {
 		if (out[i] && !memcmp(buf, outname[i], n)) {
-			chanclose(out[i]);
+			delchan(out[i]);
 			out[i] = NULL;
 			outname[i][0] = '\0';
 			return 0;
diff --git a/drivers/devfip.c b/drivers/devfip.c
@@ -284,7 +284,7 @@ fipmount(Chan *c, char *spec)
 	errno = ENOMEM;
 
 err:
-	chanclose(cspec);
+	delchan(cspec);
 	return NULL;
 }