summaryrefslogtreecommitdiff
path: root/arch/powerpc/kernel/vio.c
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2006-04-27 17:21:46 +1000
committerPaul Mackerras <paulus@samba.org>2006-04-29 18:02:01 +1000
commitdd721ffd95d5e1516380da0b254ef737582a258f (patch)
treefc31c2124b0de8b301622d755e444e4d5acb95b1 /arch/powerpc/kernel/vio.c
parente10fa77368dff31140451fac04d78d9f51f0f3ac (diff)
[PATCH] powerpc: use a common vio_match_device routine
This requires the compatible properties having vaules that are empty strings instead of just being empty properties. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/vio.c')
-rw-r--r--arch/powerpc/kernel/vio.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c
index 9b46eed5e637..19529297a2dc 100644
--- a/arch/powerpc/kernel/vio.c
+++ b/arch/powerpc/kernel/vio.c
@@ -47,7 +47,8 @@ static const struct vio_device_id *vio_match_device(
const struct vio_device_id *ids, const struct vio_dev *dev)
{
while (ids->type[0] != '\0') {
- if (vio_bus_ops.match(ids, dev))
+ if ((strncmp(dev->type, ids->type, strlen(ids->type)) == 0) &&
+ device_is_compatible(dev->dev.platform_data, ids->compat))
return ids;
ids++;
}