From 3c83a9762a1de398e272a7b7f41727b46006549d Mon Sep 17 00:00:00 2001 From: imp Date: Fri, 30 Sep 2005 19:39:27 +0000 Subject: Use ansi function definitions in preference to K&R to reduce diffs with NetBSD (and cause it looks cooler). --- sys/dev/dc/dcphy.c | 20 ++++++-------------- sys/dev/dc/pnphy.c | 14 ++++---------- sys/dev/mii/acphy.c | 17 +++++------------ sys/dev/mii/amphy.c | 14 ++++---------- sys/dev/mii/brgphy.c | 17 +++++------------ sys/dev/mii/ciphy.c | 14 ++++---------- sys/dev/mii/dcphy.c | 20 ++++++-------------- sys/dev/mii/exphy.c | 11 +++-------- sys/dev/mii/lxtphy.c | 20 ++++++-------------- sys/dev/mii/nsphy.c | 14 ++++---------- sys/dev/mii/pnaphy.c | 11 +++-------- sys/dev/mii/pnphy.c | 14 ++++---------- sys/dev/mii/qsphy.c | 17 +++++------------ sys/dev/mii/rgephy.c | 17 +++++------------ sys/dev/mii/rlphy.c | 14 ++++---------- sys/dev/mii/tlphy.c | 20 ++++++-------------- sys/dev/mii/ukphy.c | 11 +++-------- sys/dev/mii/xmphy.c | 17 +++++------------ 18 files changed, 82 insertions(+), 200 deletions(-) diff --git a/sys/dev/dc/dcphy.c b/sys/dev/dc/dcphy.c index 3a6a5de..f0ef674 100644 --- a/sys/dev/dc/dcphy.c +++ b/sys/dev/dc/dcphy.c @@ -115,8 +115,7 @@ static void dcphy_reset(struct mii_softc *); static int dcphy_auto(struct mii_softc *); static int -dcphy_probe(dev) - device_t dev; +dcphy_probe(device_t dev) { struct mii_attach_args *ma; @@ -136,8 +135,7 @@ dcphy_probe(dev) } static int -dcphy_attach(dev) - device_t dev; +dcphy_attach(device_t dev) { struct mii_softc *sc; struct mii_attach_args *ma; @@ -200,10 +198,7 @@ dcphy_attach(dev) } static int -dcphy_service(sc, mii, cmd) - struct mii_softc *sc; - struct mii_data *mii; - int cmd; +dcphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd) { struct dc_softc *dc_sc; struct ifmedia_entry *ife = mii->mii_media.ifm_cur; @@ -337,8 +332,7 @@ dcphy_service(sc, mii, cmd) } static void -dcphy_status(sc) - struct mii_softc *sc; +dcphy_status(struct mii_softc *sc) { struct mii_data *mii = sc->mii_pdata; int reg, anlpar, tstat = 0; @@ -421,8 +415,7 @@ skip: } static int -dcphy_auto(mii) - struct mii_softc *mii; +dcphy_auto(struct mii_softc *mii) { struct dc_softc *sc; @@ -443,8 +436,7 @@ dcphy_auto(mii) } static void -dcphy_reset(mii) - struct mii_softc *mii; +dcphy_reset(struct mii_softc *mii) { struct dc_softc *sc; diff --git a/sys/dev/dc/pnphy.c b/sys/dev/dc/pnphy.c index 98d269a..573bfb8 100644 --- a/sys/dev/dc/pnphy.c +++ b/sys/dev/dc/pnphy.c @@ -100,8 +100,7 @@ static int pnphy_service(struct mii_softc *, struct mii_data *, int); static void pnphy_status(struct mii_softc *); static int -pnphy_probe(dev) - device_t dev; +pnphy_probe(device_t dev) { struct mii_attach_args *ma; @@ -121,8 +120,7 @@ pnphy_probe(dev) } static int -pnphy_attach(dev) - device_t dev; +pnphy_attach(device_t dev) { struct mii_softc *sc; struct mii_attach_args *ma; @@ -163,10 +161,7 @@ pnphy_attach(dev) } static int -pnphy_service(sc, mii, cmd) - struct mii_softc *sc; - struct mii_data *mii; - int cmd; +pnphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd) { struct ifmedia_entry *ife = mii->mii_media.ifm_cur; @@ -246,8 +241,7 @@ pnphy_service(sc, mii, cmd) } static void -pnphy_status(sc) - struct mii_softc *sc; +pnphy_status(struct mii_softc *sc) { struct mii_data *mii = sc->mii_pdata; int reg; diff --git a/sys/dev/mii/acphy.c b/sys/dev/mii/acphy.c index aba0b26..176e392 100644 --- a/sys/dev/mii/acphy.c +++ b/sys/dev/mii/acphy.c @@ -117,8 +117,7 @@ static void acphy_reset(struct mii_softc *); static void acphy_status(struct mii_softc *); static int -acphy_probe(dev) - device_t dev; +acphy_probe(device_t dev) { struct mii_attach_args *ma; @@ -137,8 +136,7 @@ acphy_probe(dev) } static int -acphy_attach(dev) - device_t dev; +acphy_attach(device_t dev) { struct mii_softc *sc; struct mii_attach_args *ma; @@ -171,10 +169,7 @@ acphy_attach(dev) } static int -acphy_service(sc, mii, cmd) - struct mii_softc *sc; - struct mii_data *mii; - int cmd; +acphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd) { struct ifmedia_entry *ife = mii->mii_media.ifm_cur; int reg; @@ -257,8 +252,7 @@ acphy_service(sc, mii, cmd) } static void -acphy_status(sc) - struct mii_softc *sc; +acphy_status(struct mii_softc *sc) { struct mii_data *mii = sc->mii_pdata; struct ifmedia_entry *ife = mii->mii_media.ifm_cur; @@ -301,8 +295,7 @@ acphy_status(sc) } static void -acphy_reset(sc) - struct mii_softc *sc; +acphy_reset(struct mii_softc *sc) { mii_phy_reset(sc); diff --git a/sys/dev/mii/amphy.c b/sys/dev/mii/amphy.c index dac0938..78e5544 100644 --- a/sys/dev/mii/amphy.c +++ b/sys/dev/mii/amphy.c @@ -83,8 +83,7 @@ static int amphy_service(struct mii_softc *, struct mii_data *, int); static void amphy_status(struct mii_softc *); static int -amphy_probe(dev) - device_t dev; +amphy_probe(device_t dev) { struct mii_attach_args *ma; @@ -105,8 +104,7 @@ amphy_probe(dev) } static int -amphy_attach(dev) - device_t dev; +amphy_attach(device_t dev) { struct mii_softc *sc; struct mii_attach_args *ma; @@ -148,10 +146,7 @@ amphy_attach(dev) } static int -amphy_service(sc, mii, cmd) - struct mii_softc *sc; - struct mii_data *mii; - int cmd; +amphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd) { struct ifmedia_entry *ife = mii->mii_media.ifm_cur; int reg; @@ -226,8 +221,7 @@ amphy_service(sc, mii, cmd) } static void -amphy_status(sc) - struct mii_softc *sc; +amphy_status(struct mii_softc *sc) { struct mii_data *mii = sc->mii_pdata; int bmsr, bmcr, par, anlpar; diff --git a/sys/dev/mii/brgphy.c b/sys/dev/mii/brgphy.c index 25a81ef..869ebde 100644 --- a/sys/dev/mii/brgphy.c +++ b/sys/dev/mii/brgphy.c @@ -98,8 +98,7 @@ static void bcm5750_load_dspcode(struct mii_softc *); static int brgphy_mii_model; static int -brgphy_probe(dev) - device_t dev; +brgphy_probe(device_t dev) { struct mii_attach_args *ma; @@ -163,8 +162,7 @@ brgphy_probe(dev) } static int -brgphy_attach(dev) - device_t dev; +brgphy_attach(device_t dev) { struct mii_softc *sc; struct mii_attach_args *ma; @@ -237,10 +235,7 @@ brgphy_attach(dev) } static int -brgphy_service(sc, mii, cmd) - struct mii_softc *sc; - struct mii_data *mii; - int cmd; +brgphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd) { struct ifmedia_entry *ife = mii->mii_media.ifm_cur; int reg, speed, gig; @@ -406,8 +401,7 @@ setit: } static void -brgphy_status(sc) - struct mii_softc *sc; +brgphy_status(struct mii_softc *sc) { struct mii_data *mii = sc->mii_pdata; struct ifmedia_entry *ife = mii->mii_media.ifm_cur; @@ -469,8 +463,7 @@ brgphy_status(sc) static int -brgphy_mii_phy_auto(mii) - struct mii_softc *mii; +brgphy_mii_phy_auto(struct mii_softc *mii) { int ktcr = 0; diff --git a/sys/dev/mii/ciphy.c b/sys/dev/mii/ciphy.c index 86567c0..d2f069f 100644 --- a/sys/dev/mii/ciphy.c +++ b/sys/dev/mii/ciphy.c @@ -92,8 +92,7 @@ static void ciphy_reset(struct mii_softc *); static void ciphy_fixup(struct mii_softc *); static int -ciphy_probe(dev) - device_t dev; +ciphy_probe(device_t dev) { struct mii_attach_args *ma; @@ -121,8 +120,7 @@ ciphy_probe(dev) } static int -ciphy_attach(dev) - device_t dev; +ciphy_attach(device_t dev) { struct mii_softc *sc; struct mii_attach_args *ma; @@ -157,10 +155,7 @@ ciphy_attach(dev) } static int -ciphy_service(sc, mii, cmd) - struct mii_softc *sc; - struct mii_data *mii; - int cmd; +ciphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd) { struct ifmedia_entry *ife = mii->mii_media.ifm_cur; int reg, speed, gig; @@ -312,8 +307,7 @@ setit: } static void -ciphy_status(sc) - struct mii_softc *sc; +ciphy_status(struct mii_softc *sc) { struct mii_data *mii = sc->mii_pdata; int bmsr, bmcr; diff --git a/sys/dev/mii/dcphy.c b/sys/dev/mii/dcphy.c index 3a6a5de..f0ef674 100644 --- a/sys/dev/mii/dcphy.c +++ b/sys/dev/mii/dcphy.c @@ -115,8 +115,7 @@ static void dcphy_reset(struct mii_softc *); static int dcphy_auto(struct mii_softc *); static int -dcphy_probe(dev) - device_t dev; +dcphy_probe(device_t dev) { struct mii_attach_args *ma; @@ -136,8 +135,7 @@ dcphy_probe(dev) } static int -dcphy_attach(dev) - device_t dev; +dcphy_attach(device_t dev) { struct mii_softc *sc; struct mii_attach_args *ma; @@ -200,10 +198,7 @@ dcphy_attach(dev) } static int -dcphy_service(sc, mii, cmd) - struct mii_softc *sc; - struct mii_data *mii; - int cmd; +dcphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd) { struct dc_softc *dc_sc; struct ifmedia_entry *ife = mii->mii_media.ifm_cur; @@ -337,8 +332,7 @@ dcphy_service(sc, mii, cmd) } static void -dcphy_status(sc) - struct mii_softc *sc; +dcphy_status(struct mii_softc *sc) { struct mii_data *mii = sc->mii_pdata; int reg, anlpar, tstat = 0; @@ -421,8 +415,7 @@ skip: } static int -dcphy_auto(mii) - struct mii_softc *mii; +dcphy_auto(struct mii_softc *mii) { struct dc_softc *sc; @@ -443,8 +436,7 @@ dcphy_auto(mii) } static void -dcphy_reset(mii) - struct mii_softc *mii; +dcphy_reset(struct mii_softc *mii) { struct dc_softc *sc; diff --git a/sys/dev/mii/exphy.c b/sys/dev/mii/exphy.c index afb9013..61121a6 100644 --- a/sys/dev/mii/exphy.c +++ b/sys/dev/mii/exphy.c @@ -115,8 +115,7 @@ static int exphy_service(struct mii_softc *, struct mii_data *, int); static void exphy_reset(struct mii_softc *); static int -exphy_probe(dev) - device_t dev; +exphy_probe(device_t dev) { struct mii_attach_args *ma; device_t parent; @@ -148,8 +147,7 @@ exphy_probe(dev) } static int -exphy_attach(dev) - device_t dev; +exphy_attach(device_t dev) { struct mii_softc *sc; struct mii_attach_args *ma; @@ -202,10 +200,7 @@ exphy_attach(dev) } static int -exphy_service(sc, mii, cmd) - struct mii_softc *sc; - struct mii_data *mii; - int cmd; +exphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd) { struct ifmedia_entry *ife = mii->mii_media.ifm_cur; diff --git a/sys/dev/mii/lxtphy.c b/sys/dev/mii/lxtphy.c index e4d0c19..a5b6186 100644 --- a/sys/dev/mii/lxtphy.c +++ b/sys/dev/mii/lxtphy.c @@ -122,8 +122,7 @@ static void lxtphy_set_tp(struct mii_softc *); static void lxtphy_set_fx(struct mii_softc *); static int -lxtphy_probe(dev) - device_t dev; +lxtphy_probe(device_t dev) { struct mii_attach_args *ma; @@ -139,8 +138,7 @@ lxtphy_probe(dev) } static int -lxtphy_attach(dev) - device_t dev; +lxtphy_attach(device_t dev) { struct mii_softc *sc; struct mii_attach_args *ma; @@ -185,10 +183,7 @@ lxtphy_attach(dev) } static int -lxtphy_service(sc, mii, cmd) - struct mii_softc *sc; - struct mii_data *mii; - int cmd; +lxtphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd) { struct ifmedia_entry *ife = mii->mii_media.ifm_cur; int reg; @@ -270,8 +265,7 @@ lxtphy_service(sc, mii, cmd) } static void -lxtphy_status(sc) - struct mii_softc *sc; +lxtphy_status(struct mii_softc *sc) { struct mii_data *mii = sc->mii_pdata; struct ifmedia_entry *ife = mii->mii_media.ifm_cur; @@ -317,8 +311,7 @@ lxtphy_status(sc) } static void -lxtphy_set_tp(sc) - struct mii_softc *sc; +lxtphy_set_tp(struct mii_softc *sc) { int cfg; @@ -328,8 +321,7 @@ lxtphy_set_tp(sc) } static void -lxtphy_set_fx(sc) - struct mii_softc *sc; +lxtphy_set_fx(struct mii_softc *sc) { int cfg; diff --git a/sys/dev/mii/nsphy.c b/sys/dev/mii/nsphy.c index 0594149..b965ed8 100644 --- a/sys/dev/mii/nsphy.c +++ b/sys/dev/mii/nsphy.c @@ -119,8 +119,7 @@ static int nsphy_service(struct mii_softc *, struct mii_data *, int); static void nsphy_status(struct mii_softc *); static int -nsphy_probe(dev) - device_t dev; +nsphy_probe(device_t dev) { struct mii_attach_args *ma; @@ -136,8 +135,7 @@ nsphy_probe(dev) } static int -nsphy_attach(dev) - device_t dev; +nsphy_attach(device_t dev) { struct mii_softc *sc; struct mii_attach_args *ma; @@ -189,10 +187,7 @@ nsphy_attach(dev) } static int -nsphy_service(sc, mii, cmd) - struct mii_softc *sc; - struct mii_data *mii; - int cmd; +nsphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd) { struct ifmedia_entry *ife = mii->mii_media.ifm_cur; int reg; @@ -311,8 +306,7 @@ nsphy_service(sc, mii, cmd) } static void -nsphy_status(sc) - struct mii_softc *sc; +nsphy_status(struct mii_softc *sc) { struct mii_data *mii = sc->mii_pdata; int bmsr, bmcr, par, anlpar; diff --git a/sys/dev/mii/pnaphy.c b/sys/dev/mii/pnaphy.c index 6f3ab65..cd69488 100644 --- a/sys/dev/mii/pnaphy.c +++ b/sys/dev/mii/pnaphy.c @@ -86,8 +86,7 @@ DRIVER_MODULE(pnaphy, miibus, pnaphy_driver, pnaphy_devclass, 0, 0); static int pnaphy_service(struct mii_softc *, struct mii_data *,int); static int -pnaphy_probe(dev) - device_t dev; +pnaphy_probe(device_t dev) { struct mii_attach_args *ma; @@ -104,8 +103,7 @@ pnaphy_probe(dev) } static int -pnaphy_attach(dev) - device_t dev; +pnaphy_attach(device_t dev) { struct mii_softc *sc; struct mii_attach_args *ma; @@ -155,10 +153,7 @@ pnaphy_attach(dev) } static int -pnaphy_service(sc, mii, cmd) - struct mii_softc *sc; - struct mii_data *mii; - int cmd; +pnaphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd) { struct ifmedia_entry *ife = mii->mii_media.ifm_cur; int reg; diff --git a/sys/dev/mii/pnphy.c b/sys/dev/mii/pnphy.c index 98d269a..573bfb8 100644 --- a/sys/dev/mii/pnphy.c +++ b/sys/dev/mii/pnphy.c @@ -100,8 +100,7 @@ static int pnphy_service(struct mii_softc *, struct mii_data *, int); static void pnphy_status(struct mii_softc *); static int -pnphy_probe(dev) - device_t dev; +pnphy_probe(device_t dev) { struct mii_attach_args *ma; @@ -121,8 +120,7 @@ pnphy_probe(dev) } static int -pnphy_attach(dev) - device_t dev; +pnphy_attach(device_t dev) { struct mii_softc *sc; struct mii_attach_args *ma; @@ -163,10 +161,7 @@ pnphy_attach(dev) } static int -pnphy_service(sc, mii, cmd) - struct mii_softc *sc; - struct mii_data *mii; - int cmd; +pnphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd) { struct ifmedia_entry *ife = mii->mii_media.ifm_cur; @@ -246,8 +241,7 @@ pnphy_service(sc, mii, cmd) } static void -pnphy_status(sc) - struct mii_softc *sc; +pnphy_status(struct mii_softc *sc) { struct mii_data *mii = sc->mii_pdata; int reg; diff --git a/sys/dev/mii/qsphy.c b/sys/dev/mii/qsphy.c index 9c92ed8..ad06072 100644 --- a/sys/dev/mii/qsphy.c +++ b/sys/dev/mii/qsphy.c @@ -121,8 +121,7 @@ static void qsphy_reset(struct mii_softc *); static void qsphy_status(struct mii_softc *); static int -qsphy_probe(dev) - device_t dev; +qsphy_probe(device_t dev) { struct mii_attach_args *ma; @@ -138,8 +137,7 @@ qsphy_probe(dev) } static int -qsphy_attach(dev) - device_t dev; +qsphy_attach(device_t dev) { struct mii_softc *sc; struct mii_attach_args *ma; @@ -172,10 +170,7 @@ qsphy_attach(dev) } static int -qsphy_service(sc, mii, cmd) - struct mii_softc *sc; - struct mii_data *mii; - int cmd; +qsphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd) { struct ifmedia_entry *ife = mii->mii_media.ifm_cur; int reg; @@ -253,8 +248,7 @@ qsphy_service(sc, mii, cmd) } static void -qsphy_status(sc) - struct mii_softc *sc; +qsphy_status(struct mii_softc *sc) { struct mii_data *mii = sc->mii_pdata; int bmsr, bmcr, pctl; @@ -305,8 +299,7 @@ qsphy_status(sc) } static void -qsphy_reset(sc) - struct mii_softc *sc; +qsphy_reset(struct mii_softc *sc) { mii_phy_reset(sc); diff --git a/sys/dev/mii/rgephy.c b/sys/dev/mii/rgephy.c index ad384a9..001ce37 100644 --- a/sys/dev/mii/rgephy.c +++ b/sys/dev/mii/rgephy.c @@ -92,8 +92,7 @@ static void rgephy_load_dspcode(struct mii_softc *); static int rgephy_mii_model; static int -rgephy_probe(dev) - device_t dev; +rgephy_probe(device_t dev) { struct mii_attach_args *ma; @@ -109,8 +108,7 @@ rgephy_probe(dev) } static int -rgephy_attach(dev) - device_t dev; +rgephy_attach(device_t dev) { struct mii_softc *sc; struct mii_attach_args *ma; @@ -166,10 +164,7 @@ rgephy_attach(dev) } static int -rgephy_service(sc, mii, cmd) - struct mii_softc *sc; - struct mii_data *mii; - int cmd; +rgephy_service(struct mii_softc *sc, struct mii_data *mii, int cmd) { struct ifmedia_entry *ife = mii->mii_media.ifm_cur; int reg, speed, gig; @@ -325,8 +320,7 @@ setit: } static void -rgephy_status(sc) - struct mii_softc *sc; +rgephy_status(struct mii_softc *sc) { struct mii_data *mii = sc->mii_pdata; int bmsr, bmcr; @@ -368,8 +362,7 @@ rgephy_status(sc) static int -rgephy_mii_phy_auto(mii) - struct mii_softc *mii; +rgephy_mii_phy_auto(struct mii_softc *mii) { rgephy_loop(mii); rgephy_reset(mii); diff --git a/sys/dev/mii/rlphy.c b/sys/dev/mii/rlphy.c index f9c9b5e..cef10c6 100644 --- a/sys/dev/mii/rlphy.c +++ b/sys/dev/mii/rlphy.c @@ -83,8 +83,7 @@ static int rlphy_service(struct mii_softc *, struct mii_data *, int); static void rlphy_status(struct mii_softc *); static int -rlphy_probe(dev) - device_t dev; +rlphy_probe(device_t dev) { struct mii_attach_args *ma; device_t parent; @@ -120,8 +119,7 @@ rlphy_probe(dev) } static int -rlphy_attach(dev) - device_t dev; +rlphy_attach(device_t dev) { struct mii_softc *sc; struct mii_attach_args *ma; @@ -174,10 +172,7 @@ rlphy_attach(dev) } static int -rlphy_service(sc, mii, cmd) - struct mii_softc *sc; - struct mii_data *mii; - int cmd; +rlphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd) { struct ifmedia_entry *ife = mii->mii_media.ifm_cur; @@ -251,8 +246,7 @@ rlphy_service(sc, mii, cmd) } static void -rlphy_status(phy) - struct mii_softc *phy; +rlphy_status(struct mii_softc *phy) { struct mii_data *mii = phy->mii_pdata; int bmsr, bmcr, anlpar; diff --git a/sys/dev/mii/tlphy.c b/sys/dev/mii/tlphy.c index f07e33e1..7baf700 100644 --- a/sys/dev/mii/tlphy.c +++ b/sys/dev/mii/tlphy.c @@ -128,8 +128,7 @@ static void tlphy_acomp(struct tlphy_softc *); static void tlphy_status(struct tlphy_softc *); static int -tlphy_probe(dev) - device_t dev; +tlphy_probe(device_t dev) { struct mii_attach_args *ma; @@ -145,8 +144,7 @@ tlphy_probe(dev) } static int -tlphy_attach(dev) - device_t dev; +tlphy_attach(device_t dev) { struct tlphy_softc *sc; struct mii_attach_args *ma; @@ -226,10 +224,7 @@ tlphy_attach(dev) } static int -tlphy_service(self, mii, cmd) - struct mii_softc *self; - struct mii_data *mii; - int cmd; +tlphy_service(struct mii_softc *self, struct mii_data *mii, int cmd) { struct tlphy_softc *sc = (struct tlphy_softc *)self; struct ifmedia_entry *ife = mii->mii_media.ifm_cur; @@ -340,8 +335,7 @@ tlphy_service(self, mii, cmd) } static void -tlphy_status(sc) - struct tlphy_softc *sc; +tlphy_status(struct tlphy_softc *sc) { struct mii_data *mii = sc->sc_mii.mii_pdata; int bmsr, bmcr, tlctrl; @@ -383,8 +377,7 @@ tlphy_status(sc) } static int -tlphy_auto(sc) - struct tlphy_softc *sc; +tlphy_auto(struct tlphy_softc *sc) { int error; @@ -410,8 +403,7 @@ tlphy_auto(sc) } static void -tlphy_acomp(sc) - struct tlphy_softc *sc; +tlphy_acomp(struct tlphy_softc *sc) { int aner, anlpar; diff --git a/sys/dev/mii/ukphy.c b/sys/dev/mii/ukphy.c index 2d87b56..6c078cc 100644 --- a/sys/dev/mii/ukphy.c +++ b/sys/dev/mii/ukphy.c @@ -114,8 +114,7 @@ DRIVER_MODULE(ukphy, miibus, ukphy_driver, ukphy_devclass, 0, 0); static int ukphy_service(struct mii_softc *, struct mii_data *, int); static int -ukphy_probe(dev) - device_t dev; +ukphy_probe(device_t dev) { /* @@ -126,8 +125,7 @@ ukphy_probe(dev) } static int -ukphy_attach(dev) - device_t dev; +ukphy_attach(device_t dev) { struct mii_softc *sc; struct mii_attach_args *ma; @@ -170,10 +168,7 @@ ukphy_attach(dev) } static int -ukphy_service(sc, mii, cmd) - struct mii_softc *sc; - struct mii_data *mii; - int cmd; +ukphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd) { struct ifmedia_entry *ife = mii->mii_media.ifm_cur; int reg; diff --git a/sys/dev/mii/xmphy.c b/sys/dev/mii/xmphy.c index c6d2ee9..b6bf7f1 100644 --- a/sys/dev/mii/xmphy.c +++ b/sys/dev/mii/xmphy.c @@ -84,8 +84,7 @@ static void xmphy_status(struct mii_softc *); static int xmphy_mii_phy_auto(struct mii_softc *); static int -xmphy_probe(dev) - device_t dev; +xmphy_probe(device_t dev) { struct mii_attach_args *ma; @@ -107,8 +106,7 @@ xmphy_probe(dev) } static int -xmphy_attach(dev) - device_t dev; +xmphy_attach(device_t dev) { struct mii_softc *sc; struct mii_attach_args *ma; @@ -159,10 +157,7 @@ xmphy_attach(dev) } static int -xmphy_service(sc, mii, cmd) - struct mii_softc *sc; - struct mii_data *mii; - int cmd; +xmphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd) { struct ifmedia_entry *ife = mii->mii_media.ifm_cur; int reg; @@ -272,8 +267,7 @@ xmphy_service(sc, mii, cmd) } static void -xmphy_status(sc) - struct mii_softc *sc; +xmphy_status(struct mii_softc *sc) { struct mii_data *mii = sc->mii_pdata; int bmsr, bmcr, anlpar; @@ -327,8 +321,7 @@ xmphy_status(sc) static int -xmphy_mii_phy_auto(mii) - struct mii_softc *mii; +xmphy_mii_phy_auto(struct mii_softc *mii) { int anar = 0; -- cgit v1.1