diff options
| author |   jasper <jasper@openbsd.org> | 2015-07-19 21:11:47 +0000 |
|---|---|---|
| committer | jasper <jasper@openbsd.org> | 2015-07-19 21:11:47 +0000 |
| commit | 60d64acfa9317ec017d2038bdc62d7ec82e00d51 (patch) | |
| tree | 597265f5a10ff6bd96c26e155f486022beecbf00 | |
| parent | Remove unneeded #include <disklabel.h>. (diff) | |
| download | wireguard-openbsd-60d64acfa9317ec017d2038bdc62d7ec82e00d51.tar.xz wireguard-openbsd-60d64acfa9317ec017d2038bdc62d7ec82e00d51.zip | |
don't check for the name in attach_args being NULL; nothing should call
their match functions with (g)aa_name not set.
ok miod@
| -rw-r--r-- | sys/arch/loongson/dev/glxclk.c | 5 | ||||
| -rw-r--r-- | sys/arch/octeon/dev/octrng.c | 6 |
2 files changed, 4 insertions, 7 deletions
diff --git a/sys/arch/loongson/dev/glxclk.c b/sys/arch/loongson/dev/glxclk.c index 203bd566f67..5b8429e0889 100644 --- a/sys/arch/loongson/dev/glxclk.c +++ b/sys/arch/loongson/dev/glxclk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: glxclk.c,v 1.4 2013/01/15 23:30:36 pirofti Exp $ */ +/* $OpenBSD: glxclk.c,v 1.5 2015/07/19 21:11:47 jasper Exp $ */ /* * Copyright (c) 2013 Paul Irofti. @@ -100,8 +100,7 @@ glxclk_match(struct device *parent, void *match, void *aux) struct glxpcib_attach_args *gaa = aux; struct cfdata *cf = match; - if (gaa->gaa_name == NULL || strcmp(gaa->gaa_name, - cf->cf_driver->cd_name) != 0) + if (strcmp(gaa->gaa_name, cf->cf_driver->cd_name) != 0) return 0; return 1; diff --git a/sys/arch/octeon/dev/octrng.c b/sys/arch/octeon/dev/octrng.c index 0210fb65467..9b34e02aae2 100644 --- a/sys/arch/octeon/dev/octrng.c +++ b/sys/arch/octeon/dev/octrng.c @@ -1,4 +1,4 @@ -/* $OpenBSD: octrng.c,v 1.5 2014/05/07 14:44:54 pirofti Exp $ */ +/* $OpenBSD: octrng.c,v 1.6 2015/07/19 21:11:47 jasper Exp $ */ /* * Copyright (c) 2013 Paul Irofti <pirofti@openbsd.org> * @@ -76,11 +76,9 @@ octrng_match(struct device *parent, void *match, void *aux) /* XXX: check for board type */ - if (aa->aa_name == NULL || - strcmp(aa->aa_name, cf->cf_driver->cd_name) != 0) + if (strcmp(aa->aa_name, cf->cf_driver->cd_name) != 0) return (0); - return (1); } |