aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dio/dio-driver.c
diff options
context:
space:
mode:
authorAkinobu Mita <akinobu.mita@gmail.com>2008-07-17 15:16:35 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-20 20:24:40 -0400
commit18c993629a5a5938a032f04a698d15122550593d (patch)
tree4016e8903da9c043da6ca386a1c22a9aa21c1156 /drivers/dio/dio-driver.c
parent93026e217b46b70f9719caf69e716fa3bbe1d20c (diff)
dio: use dio_match_device() in dio_bus_match()
dio_bus_match() can use dio_match_device(). Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/dio/dio-driver.c')
-rw-r--r--drivers/dio/dio-driver.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/dio/dio-driver.c b/drivers/dio/dio-driver.c
index 8cd8507b1a8a..9c0c9afcd0ac 100644
--- a/drivers/dio/dio-driver.c
+++ b/drivers/dio/dio-driver.c
@@ -119,19 +119,7 @@ static int dio_bus_match(struct device *dev, struct device_driver *drv)
119 if (!ids) 119 if (!ids)
120 return 0; 120 return 0;
121 121
122 while (ids->id) { 122 return dio_match_device(ids, d) ? 1 : 0;
123 if (ids->id == DIO_WILDCARD)
124 return 1;
125 if (DIO_NEEDSSECID(ids->id & 0xff)) {
126 if (ids->id == d->id)
127 return 1;
128 } else {
129 if ((ids->id & 0xff) == (d->id & 0xff))
130 return 1;
131 }
132 ids++;
133 }
134 return 0;
135} 123}
136 124
137 125