d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OFWPCI: Fix style(9).

Browse Source 
No functional change.

MFC after: 3 weeks
This commit is contained in:
Michal Meloun 2016-07-11 08:24:04 +00:00
parent 60169cb210
commit fc3466adda
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=302560
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sys/dev/ofw/ofwpci.c
View File

@ -195,7 +195,7 @@ ofw_pci_init(device_t dev)
sc->sc_io_rman.rm_type = RMAN_ARRAY;
sc->sc_io_rman.rm_descr = "PCI I/O Ports";
error = rman_init(&sc->sc_io_rman);
if (error) {
if (error != 0) {
device_printf(dev, "rman_init() failed. error = %d\n", error);
goto out;
}
@ -203,7 +203,7 @@ ofw_pci_init(device_t dev)
sc->sc_mem_rman.rm_type = RMAN_ARRAY;
sc->sc_mem_rman.rm_descr = "PCI Memory";
error = rman_init(&sc->sc_mem_rman);
if (error) {
if (error != 0) {
device_printf(dev, "rman_init() failed. error = %d\n", error);
goto out;
}
@ -226,7 +226,7 @@ ofw_pci_init(device_t dev)
break;
}
if (error) {
if (error != 0) {
device_printf(dev,
"rman_manage_region(%x, %#jx, %#jx) failed. "
"error = %d\n", rp->pci_hi &
@ -257,7 +257,7 @@ ofw_pci_attach(device_t dev)
sc = device_get_softc(dev);
if (!sc->sc_initialized) {
error = ofw_pci_init(dev);
if (error)
if (error != 0)
return (error);
}
@ -437,9 +437,11 @@ ofw_pci_release_resource(device_t bus, device_t child, int type, int rid,
{
if (rman_get_flags(res) & RF_ACTIVE) {
int error = bus_deactivate_resource(child, type, rid, res);
if (error)
return error;
int error;
error = bus_deactivate_resource(child, type, rid, res);
if (error != 0)
return (error);
}
return (rman_release_resource(res));
@ -544,9 +546,10 @@ static int
ofw_pci_adjust_resource(device_t bus, device_t child, int type,
struct resource *res, rman_res_t start, rman_res_t end)
{
struct rman *rm = NULL;
struct ofw_pci_softc *sc = device_get_softc(bus);
struct rman *rm;
struct ofw_pci_softc *sc;
sc = device_get_softc(bus);
KASSERT(!(rman_get_flags(res) & RF_ACTIVE),
("active resources cannot be adjusted"));
if (rman_get_flags(res) & RF_ACTIVE)