9os

commit e3b79b179f4d0b6b46744c200e6541ceccf378fe
parent a73d314881fdc996e2649e6154e6f6d6654bb05d
Author: Roberto Vargas <roberto.vargas@arm.com>
Date:   Thu, 28 Feb 2019 14:46:22 +0000

[dev] Remove attach field in Dev

All the devs were using exactly the same code.

Change-Id: Iad7bb439822732b34313b743e79ce029ee77fc4c

Diffstat:
M
drivers/dev.c
 | 
2
+-
M
drivers/dev.h
 | 
1
-
M
drivers/devblob.c
 | 
7
-------
M
drivers/devroot.c
 | 
7
-------
M
drivers/devuart.c
 | 
7
-------

5 files changed, 1 insertion(+), 23 deletions(-)
diff --git a/drivers/dev.c b/drivers/dev.c
@@ -148,7 +148,7 @@ namec(const char *name, int mode)
 			return NULL;
 		}
 
-		c = devtab[type]->attach(n);
+		c = devattach(devtab[type]->id, n);
 		break;
 	default:
 		errno = ENOENT;
diff --git a/drivers/dev.h b/drivers/dev.h
@@ -24,7 +24,6 @@ struct dev {
 	char name[NAMELEN];
 	Chan * (*clone)(Chan *c, Chan *nc);
 	int (*walk)(Chan *c, const char *name);
-	Chan * (*attach)(int dev);
 	int (*read)(Chan *c, void *buf, int n);
 	int (*write)(Chan *c, void *buf, int n);
 	int (*bind)(Chan *cw, Chan *cn);
diff --git a/drivers/devblob.c b/drivers/devblob.c
@@ -31,12 +31,6 @@ blobwalk(Chan *c, const char *name)
 	return devwalk(c, name, blobfstab, nblobs+1, devgen);
 }
 
-static Chan *
-blobattach(int dev)
-{
-	return devattach('b', dev);
-}
-
 static int
 blobread(Chan *c, void *buf, int n)
 {
@@ -155,7 +149,6 @@ const Dev blobdevtab = {
 	.id = 'b',
 	.name = "blob",
 	.clone = devclone,
-	.attach = blobattach,
 	.walk = blobwalk,
 	.read = blobread,
 	.write = blobwrite,
diff --git a/drivers/devroot.c b/drivers/devroot.c
@@ -86,12 +86,6 @@ rootbind(Chan *cn, Chan *cw)
 	return 0;
 }
 
-static Chan *
-rootattach(int dev)
-{
-	return devattach('/', dev);
-}
-
 static int
 rootread(Chan *c, void *buf, int n)
 {
@@ -102,7 +96,6 @@ const Dev rootdevtab = {
 	.id = '/',
 	.name = "root",
 	.clone = devclone,
-	.attach = rootattach,
 	.walk = rootwalk,
 	.read = rootread,
 	.write = devwrite,
diff --git a/drivers/devuart.c b/drivers/devuart.c
@@ -45,12 +45,6 @@ uartwalk(Chan *c, const char *name)
 	}
 }
 
-static Chan *
-uartattach(int dev)
-{
-	return devattach('t', dev);
-}
-
 static Uart *
 getuart(Chan *c)
 {
@@ -284,7 +278,6 @@ uartlink(Uartphy *phy, Attr *attr)
 const Dev uartdevtab = {
 	.id = 't',
 	.name = "uart",
-	.attach = uartattach,
 	.walk = uartwalk,
 	.clone = devclone,
 	.read = uartread,