upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-04-25 16:18:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move the duplicated code to a single function.

Browse source 
No functional changes.
This commit is contained in:
Luiz Otavio O Souza 2014-10-23 23:20:04 +00:00
parent 41019211af
commit 88516632a7
3 changed files with 38 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
sys/dev/gpio/gpiobus.c
View file

@ -99,6 +99,34 @@ gpiobus_print_pins(struct gpiobus_ivar *devi)
printf("%d", range_start);
}
int
gpiobus_init_softc(device_t dev)
{
struct gpiobus_softc *sc;
sc = GPIOBUS_SOFTC(dev);
sc->sc_busdev = dev;
sc->sc_dev = device_get_parent(dev);
if (GPIO_PIN_MAX(sc->sc_dev, &sc->sc_npins) != 0)
return (ENXIO);
KASSERT(sc->sc_npins != 0, ("GPIO device with no pins"));
/* Pins = GPIO_PIN_MAX() + 1 */
sc->sc_npins++;
sc->sc_pins_mapped = malloc(sizeof(int) * sc->sc_npins, M_DEVBUF,
M_NOWAIT | M_ZERO);
if (sc->sc_pins_mapped == NULL)
return (ENOMEM);
/* Initialize the bus lock. */
GPIOBUS_LOCK_INIT(sc);
return (0);
}
static int
gpiobus_parse_pins(struct gpiobus_softc *sc, device_t child, int mask)
{
@ -163,30 +191,11 @@ gpiobus_probe(device_t dev)
static int
gpiobus_attach(device_t dev)
{
struct gpiobus_softc *sc = GPIOBUS_SOFTC(dev);
int res;
int err;
sc->sc_busdev = dev;
sc->sc_dev = device_get_parent(dev);
res = GPIO_PIN_MAX(sc->sc_dev, &sc->sc_npins);
if (res)
return (ENXIO);
KASSERT(sc->sc_npins != 0, ("GPIO device with no pins"));
/*
* Increase to get number of pins
*/
sc->sc_npins++;
sc->sc_pins_mapped = malloc(sizeof(int) * sc->sc_npins, M_DEVBUF,
M_NOWAIT | M_ZERO);
if (!sc->sc_pins_mapped)
return (ENOMEM);
/* init bus lock */
GPIOBUS_LOCK_INIT(sc);
err = gpiobus_init_softc(dev);
if (err != 0)
return (err);
/*
* Get parent's pins and mark them as unmapped

1
sys/dev/gpio/gpiobusvar.h
View file

@ -89,6 +89,7 @@ gpio_map_gpios(device_t bus, phandle_t dev, phandle_t gparent, int gcells,
device_t ofw_gpiobus_add_fdt_child(device_t, phandle_t);
#endif
void gpiobus_print_pins(struct gpiobus_ivar *);
int gpiobus_init_softc(device_t);
extern driver_t gpiobus_driver;

30
sys/dev/gpio/ofw_gpiobus.c
View file

@ -264,33 +264,13 @@ ofw_gpiobus_probe(device_t dev)
static int
ofw_gpiobus_attach(device_t dev)
{
struct gpiobus_softc *sc;
int err;
phandle_t child;
sc = GPIOBUS_SOFTC(dev);
sc->sc_busdev = dev;
sc->sc_dev = device_get_parent(dev);
/* Read the pin max. value */
if (GPIO_PIN_MAX(sc->sc_dev, &sc->sc_npins) != 0)
return (ENXIO);
KASSERT(sc->sc_npins != 0, ("GPIO device with no pins"));
/*
* Increase to get number of pins.
*/
sc->sc_npins++;
sc->sc_pins_mapped = malloc(sizeof(int) * sc->sc_npins, M_DEVBUF,
M_NOWAIT | M_ZERO);
if (!sc->sc_pins_mapped)
return (ENOMEM);
/* Init the bus lock. */
GPIOBUS_LOCK_INIT(sc);
err = gpiobus_init_softc(dev);
if (err != 0)
return (err);
bus_generic_probe(dev);
bus_enumerate_hinted_children(dev);