diff options
Diffstat (limited to 'drivers/base/resource.c')
-rw-r--r-- | drivers/base/resource.c | 44 |
1 files changed, 19 insertions, 25 deletions
diff --git a/drivers/base/resource.c b/drivers/base/resource.c index 3fd3f1779b..0d6f200a9d 100644 --- a/drivers/base/resource.c +++ b/drivers/base/resource.c @@ -1,17 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * */ #include <common.h> @@ -19,9 +9,9 @@ #include <xfuncs.h> #include <malloc.h> -struct device_d *device_alloc(const char *devname, int id) +struct device *device_alloc(const char *devname, int id) { - struct device_d *dev; + struct device *dev; dev = xzalloc(sizeof(*dev)); dev_set_name(dev, devname); @@ -30,7 +20,7 @@ struct device_d *device_alloc(const char *devname, int id) return dev; } -int device_add_data(struct device_d *dev, void *data, size_t size) +int device_add_data(struct device *dev, const void *data, size_t size) { free(dev->platform_data); @@ -42,7 +32,8 @@ int device_add_data(struct device_d *dev, void *data, size_t size) return 0; } -int device_add_resources(struct device_d *dev, const struct resource *res, int num) +int device_add_resources(struct device *dev, const struct resource *res, + int num) { dev->resource = xmemdup(res, sizeof(*res) * num); dev->num_resources = num; @@ -50,8 +41,9 @@ int device_add_resources(struct device_d *dev, const struct resource *res, int n return 0; } -int device_add_resource(struct device_d *dev, const char *resname, - resource_size_t start, resource_size_t size, unsigned int flags) +int device_add_resource(struct device *dev, const char *resname, + resource_size_t start, resource_size_t size, + unsigned int flags) { struct resource res = { .start = start, @@ -65,13 +57,15 @@ int device_add_resource(struct device_d *dev, const char *resname, return device_add_resources(dev, &res, 1); } -struct device_d *add_generic_device(const char* devname, int id, const char *resname, +struct device *add_child_device(struct device *parent, + const char* devname, int id, const char *resname, resource_size_t start, resource_size_t size, unsigned int flags, void *pdata) { - struct device_d *dev; + struct device *dev; dev = device_alloc(devname, id); + dev->parent = parent; dev->platform_data = pdata; device_add_resource(dev, resname, start, size, flags); @@ -79,12 +73,12 @@ struct device_d *add_generic_device(const char* devname, int id, const char *res return dev; } -EXPORT_SYMBOL(add_generic_device); +EXPORT_SYMBOL(add_child_device); -struct device_d *add_generic_device_res(const char* devname, int id, +struct device *add_generic_device_res(const char* devname, int id, struct resource *res, int nb, void *pdata) { - struct device_d *dev; + struct device *dev; dev = device_alloc(devname, id); dev->platform_data = pdata; @@ -97,7 +91,7 @@ struct device_d *add_generic_device_res(const char* devname, int id, EXPORT_SYMBOL(add_generic_device_res); #ifdef CONFIG_DRIVER_NET_DM9K -struct device_d *add_dm9000_device(int id, resource_size_t base, +struct device *add_dm9000_device(int id, resource_size_t base, resource_size_t data, int flags, void *pdata) { struct resource *res; @@ -133,7 +127,7 @@ EXPORT_SYMBOL(add_dm9000_device); #endif #ifdef CONFIG_USB_EHCI -struct device_d *add_usb_ehci_device(int id, resource_size_t hccr, +struct device *add_usb_ehci_device(int id, resource_size_t hccr, resource_size_t hcor, void *pdata) { struct resource *res; @@ -152,7 +146,7 @@ EXPORT_SYMBOL(add_usb_ehci_device); #endif #ifdef CONFIG_DRIVER_NET_KS8851_MLL -struct device_d *add_ks8851_device(int id, resource_size_t addr, +struct device *add_ks8851_device(int id, resource_size_t addr, resource_size_t addr_cmd, int flags, void *pdata) { struct resource *res; |