diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2006-11-02 01:27:35 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2006-11-02 01:27:35 +0000 |
| commit | f5ab3890d163f50779cc310e2eb866c7a4d40e80 (patch) | |
| tree | 78d24e8843be94de3235dbede71f226c781708d7 /sys | |
| parent | ad90b794d5ea23b0721686fee4da4dd1886b4fba (diff) | |
simplify parent driver matching code a bit. no-op change.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/mii/rlphy.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/sys/dev/mii/rlphy.c b/sys/dev/mii/rlphy.c index 07474f97ad1..db580c4e50f 100644 --- a/sys/dev/mii/rlphy.c +++ b/sys/dev/mii/rlphy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rlphy.c,v 1.24 2006/07/23 06:40:05 brad Exp $ */ +/* $OpenBSD: rlphy.c,v 1.25 2006/11/02 01:27:34 brad Exp $ */ /* * Copyright (c) 1998, 1999 Jason L. Wright (jason@thought.net) @@ -83,6 +83,9 @@ int rlphymatch(struct device *parent, void *match, void *aux) { struct mii_attach_args *ma = aux; + char *devname; + + devname = parent->dv_cfdata->cf_driver->cd_name; if (mii_phy_match(ma, rlphys) != NULL) return (10); @@ -91,8 +94,8 @@ rlphymatch(struct device *parent, void *match, void *aux) MII_MODEL(ma->mii_id2) != 0) return (0); - if ((strcmp(parent->dv_cfdata->cf_driver->cd_name, "re") != 0) && - (strcmp(parent->dv_cfdata->cf_driver->cd_name, "rl") != 0)) + if ((strcmp(devname, "re") != 0) && + (strcmp(devname, "rl") != 0)) return (0); /* @@ -220,6 +223,9 @@ rlphy_status(struct mii_softc *sc) struct mii_data *mii = sc->mii_pdata; struct ifmedia_entry *ife = mii->mii_media.ifm_cur; int bmsr, bmcr, anlpar; + char *devname; + + devname = sc->mii_dev.dv_parent->dv_cfdata->cf_driver->cd_name; mii->mii_media_status = IFM_AVALID; mii->mii_media_active = IFM_ETHER; @@ -294,9 +300,7 @@ rlphy_status(struct mii_softc *sc) * can test the 'SPEED10' bit of the MAC's media status * register. */ - if (strcmp("rl", - sc->mii_dev.dv_parent->dv_cfdata->cf_driver->cd_name) - == 0) { + if (strcmp("rl", devname) == 0) { if (PHY_READ(sc, RL_MEDIASTAT) & RL_MEDIASTAT_SPEED10) mii->mii_media_active |= IFM_10_T; else |