Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/55475 )
Change subject: device: Clean up resource utility function signatures ......................................................................
device: Clean up resource utility function signatures
Drop extern declarations from functions. Declare resource arguments as const.
Change-Id: I7684cc7813bad805c39a762892636818279ac134 Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/55475 Reviewed-by: Furquan Shaikh furquan@google.com Reviewed-by: Angel Pons th3fanbus@gmail.com Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/device/device_util.c M src/include/device/resource.h 2 files changed, 20 insertions(+), 24 deletions(-)
Approvals: build bot (Jenkins): Verified Furquan Shaikh: Looks good to me, approved Angel Pons: Looks good to me, approved
diff --git a/src/device/device_util.c b/src/device/device_util.c index f05f71d..a5d1860 100644 --- a/src/device/device_util.c +++ b/src/device/device_util.c @@ -450,7 +450,7 @@ * @param resource The resource whose limit is desired. * @return The end. */ -resource_t resource_end(struct resource *resource) +resource_t resource_end(const struct resource *resource) { resource_t base, end;
@@ -476,7 +476,7 @@ * @param resource The resource whose maximum is desired. * @return The maximum. */ -resource_t resource_max(struct resource *resource) +resource_t resource_max(const struct resource *resource) { resource_t max;
@@ -491,7 +491,7 @@ * @param resource The resource type to decode. * @return TODO. */ -const char *resource_type(struct resource *resource) +const char *resource_type(const struct resource *resource) { static char buffer[RESOURCE_TYPE_MAX]; snprintf(buffer, sizeof(buffer), "%s%s%s%s", @@ -513,7 +513,7 @@ * @param resource The resource that was just stored. * @param comment TODO */ -void report_resource_stored(struct device *dev, struct resource *resource, +void report_resource_stored(struct device *dev, const struct resource *resource, const char *comment) { char buf[10]; diff --git a/src/include/device/resource.h b/src/include/device/resource.h index 3a7ccf0..098d0b6 100644 --- a/src/include/device/resource.h +++ b/src/include/device/resource.h @@ -63,31 +63,27 @@ /* Generic resource helper functions */ struct device; struct bus; -extern void compact_resources(struct device *dev); -extern struct resource *probe_resource(const struct device *dev, - unsigned int index); -extern struct resource *new_resource(struct device *dev, unsigned int index); -extern struct resource *find_resource(const struct device *dev, - unsigned int index); -extern resource_t resource_end(struct resource *resource); -extern resource_t resource_max(struct resource *resource); -extern void report_resource_stored(struct device *dev, - struct resource *resource, const char *comment); +void compact_resources(struct device *dev); +struct resource *probe_resource(const struct device *dev, unsigned int index); +struct resource *new_resource(struct device *dev, unsigned int index); +struct resource *find_resource(const struct device *dev, unsigned int index); +resource_t resource_end(const struct resource *resource); +resource_t resource_max(const struct resource *resource); +void report_resource_stored(struct device *dev, const struct resource *resource, + const char *comment);
-typedef void (*resource_search_t)(void *gp, struct device *dev, - struct resource *res); -extern void search_bus_resources(struct bus *bus, - unsigned long type_mask, unsigned long type, - resource_search_t search, void *gp); +typedef void (*resource_search_t)(void *gp, struct device *dev, struct resource *res);
-extern void search_global_resources( - unsigned long type_mask, unsigned long type, - resource_search_t search, void *gp); +void search_bus_resources(struct bus *bus, unsigned long type_mask, unsigned long type, + resource_search_t search, void *gp); + +void search_global_resources(unsigned long type_mask, unsigned long type, + resource_search_t search, void *gp);
#define RESOURCE_TYPE_MAX 20 -extern const char *resource_type(struct resource *resource); +const char *resource_type(const struct resource *resource);
-static inline void *res2mmio(struct resource *res, unsigned long offset, +static inline void *res2mmio(const struct resource *res, unsigned long offset, unsigned long mask) { return (void *)(uintptr_t)((res->base + offset) & ~mask);