diff options
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/device.h | 2 | ||||
-rw-r--r-- | include/linux/firmware.h | 5 | ||||
-rw-r--r-- | include/linux/namei.h | 1 | ||||
-rw-r--r-- | include/linux/platform_device.h | 20 |
4 files changed, 19 insertions, 9 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index 2ea3e4921812..2a73d9bcbc9c 100644 --- a/include/linux/device.h +++ b/include/linux/device.h | |||
@@ -558,7 +558,7 @@ extern void wait_for_device_probe(void); | |||
558 | #ifdef CONFIG_DEVTMPFS | 558 | #ifdef CONFIG_DEVTMPFS |
559 | extern int devtmpfs_create_node(struct device *dev); | 559 | extern int devtmpfs_create_node(struct device *dev); |
560 | extern int devtmpfs_delete_node(struct device *dev); | 560 | extern int devtmpfs_delete_node(struct device *dev); |
561 | extern int devtmpfs_mount(const char *mountpoint); | 561 | extern int devtmpfs_mount(const char *mntdir); |
562 | #else | 562 | #else |
563 | static inline int devtmpfs_create_node(struct device *dev) { return 0; } | 563 | static inline int devtmpfs_create_node(struct device *dev) { return 0; } |
564 | static inline int devtmpfs_delete_node(struct device *dev) { return 0; } | 564 | static inline int devtmpfs_delete_node(struct device *dev) { return 0; } |
diff --git a/include/linux/firmware.h b/include/linux/firmware.h index d31544628436..043811f0d277 100644 --- a/include/linux/firmware.h +++ b/include/linux/firmware.h | |||
@@ -4,6 +4,7 @@ | |||
4 | #include <linux/module.h> | 4 | #include <linux/module.h> |
5 | #include <linux/types.h> | 5 | #include <linux/types.h> |
6 | #include <linux/compiler.h> | 6 | #include <linux/compiler.h> |
7 | #include <linux/gfp.h> | ||
7 | 8 | ||
8 | #define FW_ACTION_NOHOTPLUG 0 | 9 | #define FW_ACTION_NOHOTPLUG 0 |
9 | #define FW_ACTION_HOTPLUG 1 | 10 | #define FW_ACTION_HOTPLUG 1 |
@@ -38,7 +39,7 @@ int request_firmware(const struct firmware **fw, const char *name, | |||
38 | struct device *device); | 39 | struct device *device); |
39 | int request_firmware_nowait( | 40 | int request_firmware_nowait( |
40 | struct module *module, int uevent, | 41 | struct module *module, int uevent, |
41 | const char *name, struct device *device, void *context, | 42 | const char *name, struct device *device, gfp_t gfp, void *context, |
42 | void (*cont)(const struct firmware *fw, void *context)); | 43 | void (*cont)(const struct firmware *fw, void *context)); |
43 | 44 | ||
44 | void release_firmware(const struct firmware *fw); | 45 | void release_firmware(const struct firmware *fw); |
@@ -51,7 +52,7 @@ static inline int request_firmware(const struct firmware **fw, | |||
51 | } | 52 | } |
52 | static inline int request_firmware_nowait( | 53 | static inline int request_firmware_nowait( |
53 | struct module *module, int uevent, | 54 | struct module *module, int uevent, |
54 | const char *name, struct device *device, void *context, | 55 | const char *name, struct device *device, gfp_t gfp, void *context, |
55 | void (*cont)(const struct firmware *fw, void *context)) | 56 | void (*cont)(const struct firmware *fw, void *context)) |
56 | { | 57 | { |
57 | return -EINVAL; | 58 | return -EINVAL; |
diff --git a/include/linux/namei.h b/include/linux/namei.h index ec0f607b364a..028946750289 100644 --- a/include/linux/namei.h +++ b/include/linux/namei.h | |||
@@ -76,7 +76,6 @@ extern struct file *nameidata_to_filp(struct nameidata *nd, int flags); | |||
76 | extern void release_open_intent(struct nameidata *); | 76 | extern void release_open_intent(struct nameidata *); |
77 | 77 | ||
78 | extern struct dentry *lookup_one_len(const char *, struct dentry *, int); | 78 | extern struct dentry *lookup_one_len(const char *, struct dentry *, int); |
79 | extern struct dentry *lookup_one_noperm(const char *, struct dentry *); | ||
80 | 79 | ||
81 | extern int follow_down(struct path *); | 80 | extern int follow_down(struct path *); |
82 | extern int follow_up(struct path *); | 81 | extern int follow_up(struct path *); |
diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h index 3c6675c2444b..71ff887ca44e 100644 --- a/include/linux/platform_device.h +++ b/include/linux/platform_device.h | |||
@@ -83,6 +83,8 @@ struct early_platform_driver { | |||
83 | struct platform_driver *pdrv; | 83 | struct platform_driver *pdrv; |
84 | struct list_head list; | 84 | struct list_head list; |
85 | int requested_id; | 85 | int requested_id; |
86 | char *buffer; | ||
87 | int bufsize; | ||
86 | }; | 88 | }; |
87 | 89 | ||
88 | #define EARLY_PLATFORM_ID_UNSET -2 | 90 | #define EARLY_PLATFORM_ID_UNSET -2 |
@@ -102,21 +104,29 @@ extern int early_platform_driver_probe(char *class_str, | |||
102 | int nr_probe, int user_only); | 104 | int nr_probe, int user_only); |
103 | extern void early_platform_cleanup(void); | 105 | extern void early_platform_cleanup(void); |
104 | 106 | ||
107 | #define early_platform_init(class_string, platdrv) \ | ||
108 | early_platform_init_buffer(class_string, platdrv, NULL, 0) | ||
105 | 109 | ||
106 | #ifndef MODULE | 110 | #ifndef MODULE |
107 | #define early_platform_init(class_string, platform_driver) \ | 111 | #define early_platform_init_buffer(class_string, platdrv, buf, bufsiz) \ |
108 | static __initdata struct early_platform_driver early_driver = { \ | 112 | static __initdata struct early_platform_driver early_driver = { \ |
109 | .class_str = class_string, \ | 113 | .class_str = class_string, \ |
110 | .pdrv = platform_driver, \ | 114 | .buffer = buf, \ |
115 | .bufsize = bufsiz, \ | ||
116 | .pdrv = platdrv, \ | ||
111 | .requested_id = EARLY_PLATFORM_ID_UNSET, \ | 117 | .requested_id = EARLY_PLATFORM_ID_UNSET, \ |
112 | }; \ | 118 | }; \ |
113 | static int __init early_platform_driver_setup_func(char *buf) \ | 119 | static int __init early_platform_driver_setup_func(char *buffer) \ |
114 | { \ | 120 | { \ |
115 | return early_platform_driver_register(&early_driver, buf); \ | 121 | return early_platform_driver_register(&early_driver, buffer); \ |
116 | } \ | 122 | } \ |
117 | early_param(class_string, early_platform_driver_setup_func) | 123 | early_param(class_string, early_platform_driver_setup_func) |
118 | #else /* MODULE */ | 124 | #else /* MODULE */ |
119 | #define early_platform_init(class_string, platform_driver) | 125 | #define early_platform_init_buffer(class_string, platdrv, buf, bufsiz) \ |
126 | static inline char *early_platform_driver_setup_func(void) \ | ||
127 | { \ | ||
128 | return bufsiz ? buf : NULL; \ | ||
129 | } | ||
120 | #endif /* MODULE */ | 130 | #endif /* MODULE */ |
121 | 131 | ||
122 | #endif /* _PLATFORM_DEVICE_H_ */ | 132 | #endif /* _PLATFORM_DEVICE_H_ */ |