diff options
| author | Wojciech Macek <wma@FreeBSD.org> | 2018-03-15 06:19:45 +0000 |
|---|---|---|
| committer | Wojciech Macek <wma@FreeBSD.org> | 2018-03-15 06:19:45 +0000 |
| commit | d90930743f7c4bc31dd9e32f6c4e3f7574357cc3 (patch) | |
| tree | 79444001f548b78149256ee1fc3a55bfbe5b3938 /sys/powerpc/powernv/powernv_centaur.c | |
| parent | 255b83725c8815308540ea316d2c18993b12b838 (diff) | |
| download | src-d90930743f7c4bc31dd9e32f6c4e3f7574357cc3.tar.gz src-d90930743f7c4bc31dd9e32f6c4e3f7574357cc3.zip | |
Reverting r330925 for now
Notes
Notes:
svn path=/head/; revision=330971
Diffstat (limited to 'sys/powerpc/powernv/powernv_centaur.c')
| -rw-r--r-- | sys/powerpc/powernv/powernv_centaur.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/sys/powerpc/powernv/powernv_centaur.c b/sys/powerpc/powernv/powernv_centaur.c index c43646b39a16..9053c491ff44 100644 --- a/sys/powerpc/powernv/powernv_centaur.c +++ b/sys/powerpc/powernv/powernv_centaur.c @@ -57,17 +57,14 @@ struct powernv_centaur_softc static int powernv_centaur_attach(device_t); static int powernv_centaur_probe(device_t); -#ifdef FDT static const struct ofw_bus_devinfo * powernv_centaur_get_devinfo(device_t, device_t); -#endif static device_method_t powernv_centaur_methods[] = { /* Device interface */ DEVMETHOD(device_probe, powernv_centaur_probe), DEVMETHOD(device_attach, powernv_centaur_attach), -#ifdef FDT /* ofw_bus interface */ DEVMETHOD(ofw_bus_get_devinfo, powernv_centaur_get_devinfo), DEVMETHOD(ofw_bus_get_compat, ofw_bus_gen_get_compat), @@ -75,7 +72,7 @@ static device_method_t powernv_centaur_methods[] = { DEVMETHOD(ofw_bus_get_name, ofw_bus_gen_get_name), DEVMETHOD(ofw_bus_get_node, ofw_bus_gen_get_node), DEVMETHOD(ofw_bus_get_type, ofw_bus_gen_get_type), -#endif + DEVMETHOD_END }; @@ -85,9 +82,7 @@ static int powernv_centaur_probe(device_t dev) { -#ifdef FDT if (!(ofw_bus_is_compatible(dev, "ibm,centaur"))) -#endif return (ENXIO); device_set_desc(dev, "centaur"); @@ -97,7 +92,6 @@ powernv_centaur_probe(device_t dev) static int powernv_centaur_attach(device_t dev) { -#ifdef FDT phandle_t child; device_t cdev; struct ofw_bus_devinfo *dinfo; @@ -121,18 +115,13 @@ powernv_centaur_attach(device_t dev) } return (bus_generic_attach(dev)); -#else - return (ENXIO); -#endif } -#ifdef FDT static const struct ofw_bus_devinfo * powernv_centaur_get_devinfo(device_t dev, device_t child) { return (device_get_ivars(child)); } -#endif DEFINE_CLASS_0(powernv_centaur, powernv_centaur_driver, powernv_centaur_methods, sizeof(struct powernv_centaur_softc)); |