RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

DRVMGR: removed a goto and added comments

Browse Source
This commit is contained in:
Daniel Hellstrom
2015-04-09 08:36:39 +02:00
parent 1b645c3f4c
commit cc3f87c0c7
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cpukit/libdrvmgr/drvmgr.c
View File

@@ -119,7 +119,6 @@ void drvmgr_init_update(void)
goto out; goto out;
mgr->initializing_objs = 1; mgr->initializing_objs = 1;
init_registered_buses:
/* Take all buses and devices ready into the same stage /* Take all buses and devices ready into the same stage
* as the driver manager global level. * as the driver manager global level.
*/ */
@@ -170,8 +169,9 @@ init_registered_buses:
/* Make sure all buses registered and ready are taken at /* Make sure all buses registered and ready are taken at
* the same time into init level N. * the same time into init level N.
*/ */
if (bus_might_been_registered) if (bus_might_been_registered) {
goto init_registered_buses; level = -1; /* restart loop */
}
} }
/* Release bus/device initialization "Lock" */ /* Release bus/device initialization "Lock" */
@@ -598,6 +598,7 @@ int drvmgr_alloc_dev(struct drvmgr_dev **pdev, int extra)
struct drvmgr_dev *dev; struct drvmgr_dev *dev;
int size; int size;
/* The extra memory "service" is aligned to 4 bytes boundary. */
size = ((sizeof(struct drvmgr_dev) + 3) & ~0x3) + extra; size = ((sizeof(struct drvmgr_dev) + 3) & ~0x3) + extra;
dev = (struct drvmgr_dev *)calloc(size, 1); dev = (struct drvmgr_dev *)calloc(size, 1);
if (!dev) { if (!dev) {
@@ -616,6 +617,7 @@ int drvmgr_alloc_bus(struct drvmgr_bus **pbus, int extra)
struct drvmgr_bus *bus; struct drvmgr_bus *bus;
int size; int size;
/* The extra memory "service" is aligned to 4 bytes boundary. */
size = ((sizeof(struct drvmgr_bus) + 3) & ~0x3) + extra; size = ((sizeof(struct drvmgr_bus) + 3) & ~0x3) + extra;
bus = (struct drvmgr_bus *)calloc(size, 1); bus = (struct drvmgr_bus *)calloc(size, 1);
if (!bus) { if (!bus) {