diff options
-rw-r--r-- | arch/nios2/lib/longlong.h | 2 | ||||
-rw-r--r-- | drivers/base/bus.c | 2 | ||||
-rw-r--r-- | drivers/base/driver.c | 30 | ||||
-rw-r--r-- | include/environment.h | 6 |
4 files changed, 23 insertions, 17 deletions
diff --git a/arch/nios2/lib/longlong.h b/arch/nios2/lib/longlong.h index 4ab928efad..12716828ad 100644 --- a/arch/nios2/lib/longlong.h +++ b/arch/nios2/lib/longlong.h @@ -11,7 +11,7 @@ * 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. - + */ /* You have to define the following before including this file: UWtype -- An unsigned type, default type for operations (typically a "word") diff --git a/drivers/base/bus.c b/drivers/base/bus.c index 1dd139f7a3..69782d2e7b 100644 --- a/drivers/base/bus.c +++ b/drivers/base/bus.c @@ -11,7 +11,7 @@ LIST_HEAD(bus_list); EXPORT_SYMBOL(bus_list); -struct bus_type *get_bus_by_name(const char *name) +static struct bus_type *get_bus_by_name(const char *name) { struct bus_type *bus; diff --git a/drivers/base/driver.c b/drivers/base/driver.c index 6c8fd0576c..64fe2894e3 100644 --- a/drivers/base/driver.c +++ b/drivers/base/driver.c @@ -336,6 +336,21 @@ void devices_shutdown(void) } } +int dev_get_drvdata(struct device_d *dev, unsigned long *data) +{ + if (dev->of_id_entry) { + *data = dev->of_id_entry->data; + return 0; + } + + if (dev->id_entry) { + *data = dev->id_entry->driver_data; + return 0; + } + + return -ENODEV; +} + #ifdef CONFIG_CMD_DEVINFO static int do_devinfo_subtree(struct device_d *dev, int depth) { @@ -370,21 +385,6 @@ static int do_devinfo_subtree(struct device_d *dev, int depth) return 0; } -int dev_get_drvdata(struct device_d *dev, unsigned long *data) -{ - if (dev->of_id_entry) { - *data = dev->of_id_entry->data; - return 0; - } - - if (dev->id_entry) { - *data = dev->id_entry->driver_data; - return 0; - } - - return -ENODEV; -} - static int do_devinfo(int argc, char *argv[]) { struct device_d *dev; diff --git a/include/environment.h b/include/environment.h index 5cd7ecfee0..95e75e7ec7 100644 --- a/include/environment.h +++ b/include/environment.h @@ -60,6 +60,12 @@ static inline unsigned long long getenv_ull(const char *name) { return 0; } + +static inline int export(const char *var) +{ + return -EINVAL; +} + #endif int env_pop_context(void); |