Deleted Added
full compact
mvs_soc.c (220097) mvs_soc.c (227701)
1/*-
2 * Copyright (c) 2010 Alexander Motin <mav@FreeBSD.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 11 unchanged lines hidden (view full) ---

20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2010 Alexander Motin <mav@FreeBSD.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 11 unchanged lines hidden (view full) ---

20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: head/sys/dev/mvs/mvs_soc.c 220097 2011-03-28 11:08:58Z mav $");
28__FBSDID("$FreeBSD: head/sys/dev/mvs/mvs_soc.c 227701 2011-11-19 10:11:50Z hselasky $");
29
30#include <sys/param.h>
31#include <sys/module.h>
32#include <sys/systm.h>
33#include <sys/kernel.h>
34#include <sys/bus.h>
35#include <sys/endian.h>
36#include <sys/malloc.h>

--- 131 unchanged lines hidden (view full) ---

168 bus_generic_attach(dev);
169 return 0;
170}
171
172static int
173mvs_detach(device_t dev)
174{
175 struct mvs_controller *ctlr = device_get_softc(dev);
29
30#include <sys/param.h>
31#include <sys/module.h>
32#include <sys/systm.h>
33#include <sys/kernel.h>
34#include <sys/bus.h>
35#include <sys/endian.h>
36#include <sys/malloc.h>

--- 131 unchanged lines hidden (view full) ---

168 bus_generic_attach(dev);
169 return 0;
170}
171
172static int
173mvs_detach(device_t dev)
174{
175 struct mvs_controller *ctlr = device_get_softc(dev);
176 device_t *children;
177 int nchildren, i;
178
179 /* Detach & delete all children */
176
177 /* Detach & delete all children */
180 if (!device_get_children(dev, &children, &nchildren)) {
181 for (i = 0; i < nchildren; i++)
182 device_delete_child(dev, children[i]);
183 free(children, M_TEMP);
184 }
178 device_delete_all_children(dev);
179
185 /* Free interrupt. */
186 if (ctlr->irq.r_irq) {
187 bus_teardown_intr(dev, ctlr->irq.r_irq,
188 ctlr->irq.handle);
189 bus_release_resource(dev, SYS_RES_IRQ,
190 ctlr->irq.r_irq_rid, ctlr->irq.r_irq);
191 }
192 /* Free memory. */

--- 262 unchanged lines hidden ---
180 /* Free interrupt. */
181 if (ctlr->irq.r_irq) {
182 bus_teardown_intr(dev, ctlr->irq.r_irq,
183 ctlr->irq.handle);
184 bus_release_resource(dev, SYS_RES_IRQ,
185 ctlr->irq.r_irq_rid, ctlr->irq.r_irq);
186 }
187 /* Free memory. */

--- 262 unchanged lines hidden ---