Put function return types on a line by themselves.

Cleanup my earlier de-__P sweep and remove whitespace between function
names and paramters.
This commit is contained in:
Alfred Perlstein 2002-10-14 22:31:52 +00:00
parent 413f5a8add
commit 9c1c2e9924
20 changed files with 123 additions and 83 deletions

View File

@ -93,8 +93,8 @@ static const char rcsid[] =
*/ */
#define COMPAQ_PRESARIO_ID 0xb0bb0e11 #define COMPAQ_PRESARIO_ID 0xb0bb0e11
static int dcphy_probe (device_t); static int dcphy_probe(device_t);
static int dcphy_attach (device_t); static int dcphy_attach(device_t);
static device_method_t dcphy_methods[] = { static device_method_t dcphy_methods[] = {
/* device interface */ /* device interface */
@ -120,7 +120,8 @@ static void dcphy_status(struct mii_softc *);
static void dcphy_reset(struct mii_softc *); static void dcphy_reset(struct mii_softc *);
static int dcphy_auto(struct mii_softc *); static int dcphy_auto(struct mii_softc *);
static int dcphy_probe(dev) static int
dcphy_probe(dev)
device_t dev; device_t dev;
{ {
struct mii_attach_args *ma; struct mii_attach_args *ma;
@ -140,7 +141,8 @@ static int dcphy_probe(dev)
return (0); return (0);
} }
static int dcphy_attach(dev) static int
dcphy_attach(dev)
device_t dev; device_t dev;
{ {
struct mii_softc *sc; struct mii_softc *sc;

View File

@ -80,8 +80,8 @@ static const char rcsid[] =
CSR_WRITE_4(sc, reg, \ CSR_WRITE_4(sc, reg, \
CSR_READ_4(sc, reg) & ~x) CSR_READ_4(sc, reg) & ~x)
static int pnphy_probe (device_t); static int pnphy_probe(device_t);
static int pnphy_attach (device_t); static int pnphy_attach(device_t);
static device_method_t pnphy_methods[] = { static device_method_t pnphy_methods[] = {
/* device interface */ /* device interface */
@ -105,7 +105,8 @@ DRIVER_MODULE(pnphy, miibus, pnphy_driver, pnphy_devclass, 0, 0);
static int pnphy_service(struct mii_softc *, struct mii_data *, int); static int pnphy_service(struct mii_softc *, struct mii_data *, int);
static void pnphy_status(struct mii_softc *); static void pnphy_status(struct mii_softc *);
static int pnphy_probe(dev) static int
pnphy_probe(dev)
device_t dev; device_t dev;
{ {
struct mii_attach_args *ma; struct mii_attach_args *ma;
@ -125,7 +126,8 @@ static int pnphy_probe(dev)
return (0); return (0);
} }
static int pnphy_attach(dev) static int
pnphy_attach(dev)
device_t dev; device_t dev;
{ {
struct mii_softc *sc; struct mii_softc *sc;

View File

@ -92,8 +92,8 @@ static const char rcsid[] =
"$FreeBSD$"; "$FreeBSD$";
#endif #endif
static int acphy_probe (device_t); static int acphy_probe(device_t);
static int acphy_attach (device_t); static int acphy_attach(device_t);
static device_method_t acphy_methods[] = { static device_method_t acphy_methods[] = {
/* device interface */ /* device interface */
@ -118,7 +118,8 @@ static int acphy_service(struct mii_softc *, struct mii_data *, int);
static void acphy_reset(struct mii_softc *); static void acphy_reset(struct mii_softc *);
static void acphy_status(struct mii_softc *); static void acphy_status(struct mii_softc *);
static int acphy_probe(dev) static int
acphy_probe(dev)
device_t dev; device_t dev;
{ {
struct mii_attach_args *ma; struct mii_attach_args *ma;
@ -134,7 +135,8 @@ static int acphy_probe(dev)
return (0); return (0);
} }
static int acphy_attach(dev) static int
acphy_attach(dev)
device_t dev; device_t dev;
{ {
struct mii_softc *sc; struct mii_softc *sc;

View File

@ -60,8 +60,8 @@ static const char rcsid[] =
"$FreeBSD$"; "$FreeBSD$";
#endif #endif
static int amphy_probe (device_t); static int amphy_probe(device_t);
static int amphy_attach (device_t); static int amphy_attach(device_t);
static device_method_t amphy_methods[] = { static device_method_t amphy_methods[] = {
/* device interface */ /* device interface */
@ -85,7 +85,8 @@ DRIVER_MODULE(amphy, miibus, amphy_driver, amphy_devclass, 0, 0);
static int amphy_service(struct mii_softc *, struct mii_data *, int); static int amphy_service(struct mii_softc *, struct mii_data *, int);
static void amphy_status(struct mii_softc *); static void amphy_status(struct mii_softc *);
static int amphy_probe(dev) static int
amphy_probe(dev)
device_t dev; device_t dev;
{ {
struct mii_attach_args *ma; struct mii_attach_args *ma;
@ -106,7 +107,8 @@ static int amphy_probe(dev)
return(0); return(0);
} }
static int amphy_attach(dev) static int
amphy_attach(dev)
device_t dev; device_t dev;
{ {
struct mii_softc *sc; struct mii_softc *sc;

View File

@ -62,8 +62,8 @@ static const char rcsid[] =
"$FreeBSD$"; "$FreeBSD$";
#endif #endif
static int brgphy_probe (device_t); static int brgphy_probe(device_t);
static int brgphy_attach (device_t); static int brgphy_attach(device_t);
static device_method_t brgphy_methods[] = { static device_method_t brgphy_methods[] = {
/* device interface */ /* device interface */
@ -88,7 +88,8 @@ static int brgphy_service(struct mii_softc *, struct mii_data *, int);
static void brgphy_status(struct mii_softc *); static void brgphy_status(struct mii_softc *);
static int brgphy_mii_phy_auto(struct mii_softc *); static int brgphy_mii_phy_auto(struct mii_softc *);
static int brgphy_probe(dev) static int
brgphy_probe(dev)
device_t dev; device_t dev;
{ {
struct mii_attach_args *ma; struct mii_attach_args *ma;
@ -128,7 +129,8 @@ static int brgphy_probe(dev)
return(ENXIO); return(ENXIO);
} }
static int brgphy_attach(dev) static int
brgphy_attach(dev)
device_t dev; device_t dev;
{ {
struct mii_softc *sc; struct mii_softc *sc;

View File

@ -93,8 +93,8 @@ static const char rcsid[] =
*/ */
#define COMPAQ_PRESARIO_ID 0xb0bb0e11 #define COMPAQ_PRESARIO_ID 0xb0bb0e11
static int dcphy_probe (device_t); static int dcphy_probe(device_t);
static int dcphy_attach (device_t); static int dcphy_attach(device_t);
static device_method_t dcphy_methods[] = { static device_method_t dcphy_methods[] = {
/* device interface */ /* device interface */
@ -120,7 +120,8 @@ static void dcphy_status(struct mii_softc *);
static void dcphy_reset(struct mii_softc *); static void dcphy_reset(struct mii_softc *);
static int dcphy_auto(struct mii_softc *); static int dcphy_auto(struct mii_softc *);
static int dcphy_probe(dev) static int
dcphy_probe(dev)
device_t dev; device_t dev;
{ {
struct mii_attach_args *ma; struct mii_attach_args *ma;
@ -140,7 +141,8 @@ static int dcphy_probe(dev)
return (0); return (0);
} }
static int dcphy_attach(dev) static int
dcphy_attach(dev)
device_t dev; device_t dev;
{ {
struct mii_softc *sc; struct mii_softc *sc;

View File

@ -91,8 +91,8 @@ static const char rcsid[] =
"$FreeBSD$"; "$FreeBSD$";
#endif #endif
static int exphy_probe (device_t); static int exphy_probe(device_t);
static int exphy_attach (device_t); static int exphy_attach(device_t);
static device_method_t exphy_methods[] = { static device_method_t exphy_methods[] = {
/* device interface */ /* device interface */
@ -116,7 +116,8 @@ DRIVER_MODULE(xlphy, miibus, exphy_driver, exphy_devclass, 0, 0);
static int exphy_service(struct mii_softc *, struct mii_data *, int); static int exphy_service(struct mii_softc *, struct mii_data *, int);
static void exphy_reset(struct mii_softc *); static void exphy_reset(struct mii_softc *);
static int exphy_probe(dev) static int
exphy_probe(dev)
device_t dev; device_t dev;
{ {
struct mii_attach_args *ma; struct mii_attach_args *ma;
@ -148,7 +149,8 @@ static int exphy_probe(dev)
return (0); return (0);
} }
static int exphy_attach(dev) static int
exphy_attach(dev)
device_t dev; device_t dev;
{ {
struct mii_softc *sc; struct mii_softc *sc;

View File

@ -96,8 +96,8 @@ static const char rcsid[] =
"$FreeBSD$"; "$FreeBSD$";
#endif #endif
static int lxtphy_probe (device_t); static int lxtphy_probe(device_t);
static int lxtphy_attach (device_t); static int lxtphy_attach(device_t);
static device_method_t lxtphy_methods[] = { static device_method_t lxtphy_methods[] = {
/* device interface */ /* device interface */
@ -123,7 +123,8 @@ static void lxtphy_status(struct mii_softc *);
static void lxtphy_set_tp(struct mii_softc *); static void lxtphy_set_tp(struct mii_softc *);
static void lxtphy_set_fx(struct mii_softc *); static void lxtphy_set_fx(struct mii_softc *);
static int lxtphy_probe(dev) static int
lxtphy_probe(dev)
device_t dev; device_t dev;
{ {
struct mii_attach_args *ma; struct mii_attach_args *ma;
@ -139,7 +140,8 @@ static int lxtphy_probe(dev)
return (0); return (0);
} }
static int lxtphy_attach(dev) static int
lxtphy_attach(dev)
device_t dev; device_t dev;
{ {
struct mii_softc *sc; struct mii_softc *sc;

View File

@ -65,11 +65,11 @@ static const char rcsid[] =
"$FreeBSD$"; "$FreeBSD$";
#endif #endif
static int miibus_readreg (device_t, int, int); static int miibus_readreg(device_t, int, int);
static int miibus_writereg (device_t, int, int, int); static int miibus_writereg(device_t, int, int, int);
static void miibus_statchg (device_t); static void miibus_statchg(device_t);
static void miibus_linkchg (device_t); static void miibus_linkchg(device_t);
static void miibus_mediainit (device_t); static void miibus_mediainit(device_t);
static device_method_t miibus_methods[] = { static device_method_t miibus_methods[] = {
/* device interface */ /* device interface */
@ -105,7 +105,8 @@ driver_t miibus_driver = {
* to the network interface driver parent. * to the network interface driver parent.
*/ */
int miibus_probe(dev) int
miibus_probe(dev)
device_t dev; device_t dev;
{ {
struct mii_attach_args ma, *args; struct mii_attach_args ma, *args;
@ -158,7 +159,8 @@ int miibus_probe(dev)
return(0); return(0);
} }
int miibus_attach(dev) int
miibus_attach(dev)
device_t dev; device_t dev;
{ {
void **v; void **v;
@ -180,7 +182,8 @@ int miibus_attach(dev)
return(0); return(0);
} }
int miibus_detach(dev) int
miibus_detach(dev)
device_t dev; device_t dev;
{ {
struct mii_data *mii; struct mii_data *mii;
@ -193,7 +196,8 @@ int miibus_detach(dev)
return(0); return(0);
} }
static int miibus_readreg(dev, phy, reg) static int
miibus_readreg(dev, phy, reg)
device_t dev; device_t dev;
int phy, reg; int phy, reg;
{ {
@ -203,7 +207,8 @@ static int miibus_readreg(dev, phy, reg)
return(MIIBUS_READREG(parent, phy, reg)); return(MIIBUS_READREG(parent, phy, reg));
} }
static int miibus_writereg(dev, phy, reg, data) static int
miibus_writereg(dev, phy, reg, data)
device_t dev; device_t dev;
int phy, reg, data; int phy, reg, data;
{ {
@ -213,7 +218,8 @@ static int miibus_writereg(dev, phy, reg, data)
return(MIIBUS_WRITEREG(parent, phy, reg, data)); return(MIIBUS_WRITEREG(parent, phy, reg, data));
} }
static void miibus_statchg(dev) static void
miibus_statchg(dev)
device_t dev; device_t dev;
{ {
device_t parent; device_t parent;
@ -253,7 +259,8 @@ miibus_linkchg(dev)
KNOTE(&ifp->if_klist, link); KNOTE(&ifp->if_klist, link);
} }
static void miibus_mediainit(dev) static void
miibus_mediainit(dev)
device_t dev; device_t dev;
{ {
struct mii_data *mii; struct mii_data *mii;
@ -275,7 +282,8 @@ static void miibus_mediainit(dev)
return; return;
} }
int mii_phy_probe(dev, child, ifmedia_upd, ifmedia_sts) int
mii_phy_probe(dev, child, ifmedia_upd, ifmedia_sts)
device_t dev; device_t dev;
device_t *child; device_t *child;
ifm_change_cb_t ifmedia_upd; ifm_change_cb_t ifmedia_upd;

View File

@ -72,8 +72,8 @@ struct mlphy_softc {
int ml_linked; int ml_linked;
}; };
static int mlphy_probe (device_t); static int mlphy_probe(device_t);
static int mlphy_attach (device_t); static int mlphy_attach(device_t);
static device_method_t mlphy_methods[] = { static device_method_t mlphy_methods[] = {
/* device interface */ /* device interface */
@ -98,7 +98,8 @@ static int mlphy_service(struct mii_softc *, struct mii_data *, int);
static void mlphy_reset(struct mii_softc *); static void mlphy_reset(struct mii_softc *);
static void mlphy_status(struct mii_softc *); static void mlphy_status(struct mii_softc *);
static int mlphy_probe(dev) static int
mlphy_probe(dev)
device_t dev; device_t dev;
{ {
struct mii_attach_args *ma; struct mii_attach_args *ma;
@ -127,7 +128,8 @@ static int mlphy_probe(dev)
return (0); return (0);
} }
static int mlphy_attach(dev) static int
mlphy_attach(dev)
device_t dev; device_t dev;
{ {
struct mlphy_softc *msc; struct mlphy_softc *msc;
@ -372,7 +374,8 @@ mlphy_service(xsc, mii, cmd)
* The Micro Linear PHY comes out of reset with the 'autoneg * The Micro Linear PHY comes out of reset with the 'autoneg
* enable' bit set, which we don't want. * enable' bit set, which we don't want.
*/ */
static void mlphy_reset(sc) static void
mlphy_reset(sc)
struct mii_softc *sc; struct mii_softc *sc;
{ {
int reg; int reg;
@ -389,7 +392,8 @@ static void mlphy_reset(sc)
* If we negotiate a 10Mbps mode, we need to check for an alternate * If we negotiate a 10Mbps mode, we need to check for an alternate
* PHY and make sure it's enabled and set correctly. * PHY and make sure it's enabled and set correctly.
*/ */
static void mlphy_status(sc) static void
mlphy_status(sc)
struct mii_softc *sc; struct mii_softc *sc;
{ {
struct mlphy_softc *msc = (struct mlphy_softc *)sc; struct mlphy_softc *msc = (struct mlphy_softc *)sc;

View File

@ -78,8 +78,8 @@ static const char rcsid[] =
"$FreeBSD$"; "$FreeBSD$";
#endif #endif
static int nsgphy_probe (device_t); static int nsgphy_probe(device_t);
static int nsgphy_attach (device_t); static int nsgphy_attach(device_t);
static device_method_t nsgphy_methods[] = { static device_method_t nsgphy_methods[] = {
/* device interface */ /* device interface */

View File

@ -95,8 +95,8 @@ static const char rcsid[] =
"$FreeBSD$"; "$FreeBSD$";
#endif #endif
static int nsphy_probe (device_t); static int nsphy_probe(device_t);
static int nsphy_attach (device_t); static int nsphy_attach(device_t);
static device_method_t nsphy_methods[] = { static device_method_t nsphy_methods[] = {
/* device interface */ /* device interface */
@ -120,7 +120,8 @@ DRIVER_MODULE(nsphy, miibus, nsphy_driver, nsphy_devclass, 0, 0);
static int nsphy_service(struct mii_softc *, struct mii_data *, int); static int nsphy_service(struct mii_softc *, struct mii_data *, int);
static void nsphy_status(struct mii_softc *); static void nsphy_status(struct mii_softc *);
static int nsphy_probe(dev) static int
nsphy_probe(dev)
device_t dev; device_t dev;
{ {
struct mii_attach_args *ma; struct mii_attach_args *ma;
@ -136,7 +137,8 @@ static int nsphy_probe(dev)
return (0); return (0);
} }
static int nsphy_attach(dev) static int
nsphy_attach(dev)
device_t dev; device_t dev;
{ {
struct mii_softc *sc; struct mii_softc *sc;

View File

@ -66,8 +66,8 @@ static const char rcsid[] =
"$FreeBSD$"; "$FreeBSD$";
#endif #endif
static int pnaphy_probe (device_t); static int pnaphy_probe(device_t);
static int pnaphy_attach (device_t); static int pnaphy_attach(device_t);
static device_method_t pnaphy_methods[] = { static device_method_t pnaphy_methods[] = {
/* device interface */ /* device interface */

View File

@ -80,8 +80,8 @@ static const char rcsid[] =
CSR_WRITE_4(sc, reg, \ CSR_WRITE_4(sc, reg, \
CSR_READ_4(sc, reg) & ~x) CSR_READ_4(sc, reg) & ~x)
static int pnphy_probe (device_t); static int pnphy_probe(device_t);
static int pnphy_attach (device_t); static int pnphy_attach(device_t);
static device_method_t pnphy_methods[] = { static device_method_t pnphy_methods[] = {
/* device interface */ /* device interface */
@ -105,7 +105,8 @@ DRIVER_MODULE(pnphy, miibus, pnphy_driver, pnphy_devclass, 0, 0);
static int pnphy_service(struct mii_softc *, struct mii_data *, int); static int pnphy_service(struct mii_softc *, struct mii_data *, int);
static void pnphy_status(struct mii_softc *); static void pnphy_status(struct mii_softc *);
static int pnphy_probe(dev) static int
pnphy_probe(dev)
device_t dev; device_t dev;
{ {
struct mii_attach_args *ma; struct mii_attach_args *ma;
@ -125,7 +126,8 @@ static int pnphy_probe(dev)
return (0); return (0);
} }
static int pnphy_attach(dev) static int
pnphy_attach(dev)
device_t dev; device_t dev;
{ {
struct mii_softc *sc; struct mii_softc *sc;

View File

@ -96,8 +96,8 @@ static const char rcsid[] =
"$FreeBSD$"; "$FreeBSD$";
#endif #endif
static int qsphy_probe (device_t); static int qsphy_probe(device_t);
static int qsphy_attach (device_t); static int qsphy_attach(device_t);
static device_method_t qsphy_methods[] = { static device_method_t qsphy_methods[] = {
/* device interface */ /* device interface */
@ -122,7 +122,8 @@ static int qsphy_service(struct mii_softc *, struct mii_data *, int);
static void qsphy_reset(struct mii_softc *); static void qsphy_reset(struct mii_softc *);
static void qsphy_status(struct mii_softc *); static void qsphy_status(struct mii_softc *);
static int qsphy_probe(dev) static int
qsphy_probe(dev)
device_t dev; device_t dev;
{ {
struct mii_attach_args *ma; struct mii_attach_args *ma;
@ -138,7 +139,8 @@ static int qsphy_probe(dev)
return (0); return (0);
} }
static int qsphy_attach(dev) static int
qsphy_attach(dev)
device_t dev; device_t dev;
{ {
struct mii_softc *sc; struct mii_softc *sc;

View File

@ -60,8 +60,8 @@ static const char rcsid[] =
"$FreeBSD$"; "$FreeBSD$";
#endif #endif
static int rlphy_probe (device_t); static int rlphy_probe(device_t);
static int rlphy_attach (device_t); static int rlphy_attach(device_t);
static device_method_t rlphy_methods[] = { static device_method_t rlphy_methods[] = {
/* device interface */ /* device interface */
@ -85,7 +85,8 @@ DRIVER_MODULE(rlphy, miibus, rlphy_driver, rlphy_devclass, 0, 0);
static int rlphy_service(struct mii_softc *, struct mii_data *, int); static int rlphy_service(struct mii_softc *, struct mii_data *, int);
static void rlphy_status(struct mii_softc *); static void rlphy_status(struct mii_softc *);
static int rlphy_probe(dev) static int
rlphy_probe(dev)
device_t dev; device_t dev;
{ {
struct mii_attach_args *ma; struct mii_attach_args *ma;
@ -120,7 +121,8 @@ static int rlphy_probe(dev)
return (0); return (0);
} }
static int rlphy_attach(dev) static int
rlphy_attach(dev)
device_t dev; device_t dev;
{ {
struct mii_softc *sc; struct mii_softc *sc;

View File

@ -69,8 +69,8 @@ static const char rcsid[] =
"$Id: tdkphy.c,v 1.3 2000/10/14 06:20:56 jon Exp $"; "$Id: tdkphy.c,v 1.3 2000/10/14 06:20:56 jon Exp $";
#endif #endif
static int tdkphy_probe (device_t); static int tdkphy_probe(device_t);
static int tdkphy_attach (device_t); static int tdkphy_attach(device_t);
static device_method_t tdkphy_methods[] = { static device_method_t tdkphy_methods[] = {
/* device interface */ /* device interface */

View File

@ -102,8 +102,8 @@ struct tlphy_softc {
int sc_need_acomp; int sc_need_acomp;
}; };
static int tlphy_probe (device_t); static int tlphy_probe(device_t);
static int tlphy_attach (device_t); static int tlphy_attach(device_t);
static device_method_t tlphy_methods[] = { static device_method_t tlphy_methods[] = {
/* device interface */ /* device interface */
@ -129,7 +129,8 @@ static int tlphy_auto(struct tlphy_softc *);
static void tlphy_acomp(struct tlphy_softc *); static void tlphy_acomp(struct tlphy_softc *);
static void tlphy_status(struct tlphy_softc *); static void tlphy_status(struct tlphy_softc *);
static int tlphy_probe(dev) static int
tlphy_probe(dev)
device_t dev; device_t dev;
{ {
struct mii_attach_args *ma; struct mii_attach_args *ma;
@ -145,7 +146,8 @@ static int tlphy_probe(dev)
return (0); return (0);
} }
static int tlphy_attach(dev) static int
tlphy_attach(dev)
device_t dev; device_t dev;
{ {
struct tlphy_softc *sc; struct tlphy_softc *sc;

View File

@ -92,8 +92,8 @@ static const char rcsid[] =
"$FreeBSD$"; "$FreeBSD$";
#endif #endif
static int ukphy_probe (device_t); static int ukphy_probe(device_t);
static int ukphy_attach (device_t); static int ukphy_attach(device_t);
static device_method_t ukphy_methods[] = { static device_method_t ukphy_methods[] = {
/* device interface */ /* device interface */

View File

@ -62,8 +62,8 @@ static const char rcsid[] =
"$FreeBSD$"; "$FreeBSD$";
#endif #endif
static int xmphy_probe (device_t); static int xmphy_probe(device_t);
static int xmphy_attach (device_t); static int xmphy_attach(device_t);
static device_method_t xmphy_methods[] = { static device_method_t xmphy_methods[] = {
/* device interface */ /* device interface */
@ -88,7 +88,8 @@ static int xmphy_service(struct mii_softc *, struct mii_data *, int);
static void xmphy_status(struct mii_softc *); static void xmphy_status(struct mii_softc *);
static int xmphy_mii_phy_auto(struct mii_softc *); static int xmphy_mii_phy_auto(struct mii_softc *);
static int xmphy_probe(dev) static int
xmphy_probe(dev)
device_t dev; device_t dev;
{ {
struct mii_attach_args *ma; struct mii_attach_args *ma;
@ -110,7 +111,8 @@ static int xmphy_probe(dev)
return(ENXIO); return(ENXIO);
} }
static int xmphy_attach(dev) static int
xmphy_attach(dev)
device_t dev; device_t dev;
{ {
struct mii_softc *sc; struct mii_softc *sc;