summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2006-04-04 23:29:17 +0000
committerimp <imp@FreeBSD.org>2006-04-04 23:29:17 +0000
commitdb765ca50b66a2964dc7899aaa6a8e552ecab7ae (patch)
tree46fbd1234540dd0649af3d7046fe7a40bff30e7d
parent7ad8a722784adf4e58cc8fcffd6f7e2caea15aeb (diff)
downloadFreeBSD-src-db765ca50b66a2964dc7899aaa6a8e552ecab7ae.zip
FreeBSD-src-db765ca50b66a2964dc7899aaa6a8e552ecab7ae.tar.gz
newbus will zero softc, so no need to duplicate the zeroing here.
Plus a minor formatting nit in nearby code.
-rw-r--r--sys/dev/iicbus/iic.c8
-rw-r--r--sys/dev/iicbus/iicbb.c4
-rw-r--r--sys/dev/iicbus/iicsmb.c2
3 files changed, 1 insertions, 13 deletions
diff --git a/sys/dev/iicbus/iic.c b/sys/dev/iicbus/iic.c
index 9dd1431..28339fa 100644
--- a/sys/dev/iicbus/iic.c
+++ b/sys/dev/iicbus/iic.c
@@ -122,15 +122,9 @@ iic_attach(device_t dev)
{
struct iic_softc *sc = (struct iic_softc *)device_get_softc(dev);
- if (!sc)
- return (ENOMEM);
-
- bzero(sc, sizeof(struct iic_softc));
-
sc->sc_devnode = make_dev(&iic_cdevsw, device_get_unit(dev),
UID_ROOT, GID_WHEEL,
0600, "iic%d", device_get_unit(dev));
-
return (0);
}
@@ -146,7 +140,7 @@ iic_detach(device_t dev)
}
static int
-iicopen (struct cdev *dev, int flags, int fmt, struct thread *td)
+iicopen(struct cdev *dev, int flags, int fmt, struct thread *td)
{
struct iic_softc *sc = IIC_SOFTC(minor(dev));
diff --git a/sys/dev/iicbus/iicbb.c b/sys/dev/iicbus/iicbb.c
index 53ecdce..554f435 100644
--- a/sys/dev/iicbus/iicbb.c
+++ b/sys/dev/iicbus/iicbb.c
@@ -115,13 +115,9 @@ static int iicbb_attach(device_t dev)
{
struct iicbb_softc *sc = (struct iicbb_softc *)device_get_softc(dev);
- bzero(sc, sizeof(struct iicbb_softc));
-
sc->iicbus = device_add_child(dev, "iicbus", -1);
-
if (!sc->iicbus)
return (ENXIO);
-
bus_generic_attach(dev);
return (0);
diff --git a/sys/dev/iicbus/iicsmb.c b/sys/dev/iicbus/iicsmb.c
index 966063f..c2d45d4 100644
--- a/sys/dev/iicbus/iicsmb.c
+++ b/sys/dev/iicbus/iicsmb.c
@@ -153,8 +153,6 @@ iicsmb_attach(device_t dev)
{
struct iicsmb_softc *sc = (struct iicsmb_softc *)device_get_softc(dev);
- bzero(sc, sizeof(*sc));
-
sc->smbus = device_add_child(dev, "smbus", -1);
/* probe and attach the smbus */
OpenPOWER on IntegriCloud