diff options
Diffstat (limited to 'include/linux/device.h')
-rw-r--r-- | include/linux/device.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index b63fb393aa58..f62e21689fdd 100644 --- a/include/linux/device.h +++ b/include/linux/device.h | |||
@@ -238,8 +238,6 @@ struct device_driver { | |||
238 | extern int __must_check driver_register(struct device_driver *drv); | 238 | extern int __must_check driver_register(struct device_driver *drv); |
239 | extern void driver_unregister(struct device_driver *drv); | 239 | extern void driver_unregister(struct device_driver *drv); |
240 | 240 | ||
241 | extern struct device_driver *get_driver(struct device_driver *drv); | ||
242 | extern void put_driver(struct device_driver *drv); | ||
243 | extern struct device_driver *driver_find(const char *name, | 241 | extern struct device_driver *driver_find(const char *name, |
244 | struct bus_type *bus); | 242 | struct bus_type *bus); |
245 | extern int driver_probe_done(void); | 243 | extern int driver_probe_done(void); |
@@ -946,14 +944,14 @@ int _dev_info(const struct device *dev, const char *fmt, ...) | |||
946 | 944 | ||
947 | #define dev_info(dev, fmt, arg...) _dev_info(dev, fmt, ##arg) | 945 | #define dev_info(dev, fmt, arg...) _dev_info(dev, fmt, ##arg) |
948 | 946 | ||
949 | #if defined(DEBUG) | 947 | #if defined(CONFIG_DYNAMIC_DEBUG) |
950 | #define dev_dbg(dev, format, arg...) \ | ||
951 | dev_printk(KERN_DEBUG, dev, format, ##arg) | ||
952 | #elif defined(CONFIG_DYNAMIC_DEBUG) | ||
953 | #define dev_dbg(dev, format, ...) \ | 948 | #define dev_dbg(dev, format, ...) \ |
954 | do { \ | 949 | do { \ |
955 | dynamic_dev_dbg(dev, format, ##__VA_ARGS__); \ | 950 | dynamic_dev_dbg(dev, format, ##__VA_ARGS__); \ |
956 | } while (0) | 951 | } while (0) |
952 | #elif defined(DEBUG) | ||
953 | #define dev_dbg(dev, format, arg...) \ | ||
954 | dev_printk(KERN_DEBUG, dev, format, ##arg) | ||
957 | #else | 955 | #else |
958 | #define dev_dbg(dev, format, arg...) \ | 956 | #define dev_dbg(dev, format, arg...) \ |
959 | ({ \ | 957 | ({ \ |