diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-16 15:57:37 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-16 15:57:37 -0400 |
commit | 6fd03301d76bc439382710e449f58efbb233df1b (patch) | |
tree | 3c8a3217aed67319683ffc1debccdb5b3245b16c /include | |
parent | cd5232bd6be2d215a800f3d88c287ca791debfbe (diff) | |
parent | e4792aa30f9d33584d7192685ed149cc5fee737f (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (64 commits)
debugfs: use specified mode to possibly mark files read/write only
debugfs: Fix terminology inconsistency of dir name to mount debugfs filesystem.
xen: remove driver_data direct access of struct device from more drivers
usb: gadget: at91_udc: remove driver_data direct access of struct device
uml: remove driver_data direct access of struct device
block/ps3: remove driver_data direct access of struct device
s390: remove driver_data direct access of struct device
parport: remove driver_data direct access of struct device
parisc: remove driver_data direct access of struct device
of_serial: remove driver_data direct access of struct device
mips: remove driver_data direct access of struct device
ipmi: remove driver_data direct access of struct device
infiniband: ehca: remove driver_data direct access of struct device
ibmvscsi: gadget: at91_udc: remove driver_data direct access of struct device
hvcs: remove driver_data direct access of struct device
xen block: remove driver_data direct access of struct device
thermal: remove driver_data direct access of struct device
scsi: remove driver_data direct access of struct device
pcmcia: remove driver_data direct access of struct device
PCIE: remove driver_data direct access of struct device
...
Manually fix up trivial conflicts due to different direct driver_data
direct access fixups in drivers/block/{ps3disk.c,ps3vram.c}
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/device.h | 5 | ||||
-rw-r--r-- | include/linux/eisa.h | 4 | ||||
-rw-r--r-- | include/linux/firmware.h | 1 | ||||
-rw-r--r-- | include/linux/genhd.h | 2 | ||||
-rw-r--r-- | include/linux/kernel.h | 2 | ||||
-rw-r--r-- | include/linux/miscdevice.h | 1 | ||||
-rw-r--r-- | include/linux/platform_device.h | 4 | ||||
-rw-r--r-- | include/linux/sched.h | 2 | ||||
-rw-r--r-- | include/linux/tracepoint.h | 4 | ||||
-rw-r--r-- | include/linux/usb.h | 3 |
10 files changed, 18 insertions, 10 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index a4a7b10aaa48..ed4e39f2c423 100644 --- a/include/linux/device.h +++ b/include/linux/device.h | |||
@@ -114,6 +114,8 @@ extern int bus_unregister_notifier(struct bus_type *bus, | |||
114 | #define BUS_NOTIFY_BOUND_DRIVER 0x00000003 /* driver bound to device */ | 114 | #define BUS_NOTIFY_BOUND_DRIVER 0x00000003 /* driver bound to device */ |
115 | #define BUS_NOTIFY_UNBIND_DRIVER 0x00000004 /* driver about to be | 115 | #define BUS_NOTIFY_UNBIND_DRIVER 0x00000004 /* driver about to be |
116 | unbound */ | 116 | unbound */ |
117 | #define BUS_NOTIFY_UNBOUND_DRIVER 0x00000005 /* driver is unbound | ||
118 | from the device */ | ||
117 | 119 | ||
118 | extern struct kset *bus_get_kset(struct bus_type *bus); | 120 | extern struct kset *bus_get_kset(struct bus_type *bus); |
119 | extern struct klist *bus_get_device_klist(struct bus_type *bus); | 121 | extern struct klist *bus_get_device_klist(struct bus_type *bus); |
@@ -192,6 +194,7 @@ struct class { | |||
192 | struct kobject *dev_kobj; | 194 | struct kobject *dev_kobj; |
193 | 195 | ||
194 | int (*dev_uevent)(struct device *dev, struct kobj_uevent_env *env); | 196 | int (*dev_uevent)(struct device *dev, struct kobj_uevent_env *env); |
197 | char *(*nodename)(struct device *dev); | ||
195 | 198 | ||
196 | void (*class_release)(struct class *class); | 199 | void (*class_release)(struct class *class); |
197 | void (*dev_release)(struct device *dev); | 200 | void (*dev_release)(struct device *dev); |
@@ -287,6 +290,7 @@ struct device_type { | |||
287 | const char *name; | 290 | const char *name; |
288 | struct attribute_group **groups; | 291 | struct attribute_group **groups; |
289 | int (*uevent)(struct device *dev, struct kobj_uevent_env *env); | 292 | int (*uevent)(struct device *dev, struct kobj_uevent_env *env); |
293 | char *(*nodename)(struct device *dev); | ||
290 | void (*release)(struct device *dev); | 294 | void (*release)(struct device *dev); |
291 | 295 | ||
292 | struct dev_pm_ops *pm; | 296 | struct dev_pm_ops *pm; |
@@ -486,6 +490,7 @@ extern struct device *device_find_child(struct device *dev, void *data, | |||
486 | extern int device_rename(struct device *dev, char *new_name); | 490 | extern int device_rename(struct device *dev, char *new_name); |
487 | extern int device_move(struct device *dev, struct device *new_parent, | 491 | extern int device_move(struct device *dev, struct device *new_parent, |
488 | enum dpm_order dpm_order); | 492 | enum dpm_order dpm_order); |
493 | extern const char *device_get_nodename(struct device *dev, const char **tmp); | ||
489 | 494 | ||
490 | /* | 495 | /* |
491 | * Root device objects for grouping under /sys/devices | 496 | * Root device objects for grouping under /sys/devices |
diff --git a/include/linux/eisa.h b/include/linux/eisa.h index e61c0be2a459..6925249a5ac6 100644 --- a/include/linux/eisa.h +++ b/include/linux/eisa.h | |||
@@ -78,12 +78,12 @@ static inline void eisa_driver_unregister (struct eisa_driver *edrv) { } | |||
78 | /* Mimics pci.h... */ | 78 | /* Mimics pci.h... */ |
79 | static inline void *eisa_get_drvdata (struct eisa_device *edev) | 79 | static inline void *eisa_get_drvdata (struct eisa_device *edev) |
80 | { | 80 | { |
81 | return edev->dev.driver_data; | 81 | return dev_get_drvdata(&edev->dev); |
82 | } | 82 | } |
83 | 83 | ||
84 | static inline void eisa_set_drvdata (struct eisa_device *edev, void *data) | 84 | static inline void eisa_set_drvdata (struct eisa_device *edev, void *data) |
85 | { | 85 | { |
86 | edev->dev.driver_data = data; | 86 | dev_set_drvdata(&edev->dev, data); |
87 | } | 87 | } |
88 | 88 | ||
89 | /* The EISA root device. There's rumours about machines with multiple | 89 | /* The EISA root device. There's rumours about machines with multiple |
diff --git a/include/linux/firmware.h b/include/linux/firmware.h index c8ecf5b2a207..d31544628436 100644 --- a/include/linux/firmware.h +++ b/include/linux/firmware.h | |||
@@ -5,7 +5,6 @@ | |||
5 | #include <linux/types.h> | 5 | #include <linux/types.h> |
6 | #include <linux/compiler.h> | 6 | #include <linux/compiler.h> |
7 | 7 | ||
8 | #define FIRMWARE_NAME_MAX 30 | ||
9 | #define FW_ACTION_NOHOTPLUG 0 | 8 | #define FW_ACTION_NOHOTPLUG 0 |
10 | #define FW_ACTION_HOTPLUG 1 | 9 | #define FW_ACTION_HOTPLUG 1 |
11 | 10 | ||
diff --git a/include/linux/genhd.h b/include/linux/genhd.h index 7cbd38d363a2..45fc320a53c6 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h | |||
@@ -142,7 +142,7 @@ struct gendisk { | |||
142 | * disks that can't be partitioned. */ | 142 | * disks that can't be partitioned. */ |
143 | 143 | ||
144 | char disk_name[DISK_NAME_LEN]; /* name of major driver */ | 144 | char disk_name[DISK_NAME_LEN]; /* name of major driver */ |
145 | 145 | char *(*nodename)(struct gendisk *gd); | |
146 | /* Array of pointers to partitions indexed by partno. | 146 | /* Array of pointers to partitions indexed by partno. |
147 | * Protected with matching bdev lock but stat and other | 147 | * Protected with matching bdev lock but stat and other |
148 | * non-critical accesses use RCU. Always access through | 148 | * non-critical accesses use RCU. Always access through |
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 1b2e1747df1a..c5a71c38a95f 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h | |||
@@ -408,7 +408,7 @@ static inline char *pack_hex_byte(char *buf, u8 byte) | |||
408 | * | 408 | * |
409 | * Use tracing_on/tracing_off when you want to quickly turn on or off | 409 | * Use tracing_on/tracing_off when you want to quickly turn on or off |
410 | * tracing. It simply enables or disables the recording of the trace events. | 410 | * tracing. It simply enables or disables the recording of the trace events. |
411 | * This also corresponds to the user space debugfs/tracing/tracing_on | 411 | * This also corresponds to the user space /sys/kernel/debug/tracing/tracing_on |
412 | * file, which gives a means for the kernel and userspace to interact. | 412 | * file, which gives a means for the kernel and userspace to interact. |
413 | * Place a tracing_off() in the kernel where you want tracing to end. | 413 | * Place a tracing_off() in the kernel where you want tracing to end. |
414 | * From user space, examine the trace, and then echo 1 > tracing_on | 414 | * From user space, examine the trace, and then echo 1 > tracing_on |
diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h index beb6ec99cfef..052117744629 100644 --- a/include/linux/miscdevice.h +++ b/include/linux/miscdevice.h | |||
@@ -41,6 +41,7 @@ struct miscdevice { | |||
41 | struct list_head list; | 41 | struct list_head list; |
42 | struct device *parent; | 42 | struct device *parent; |
43 | struct device *this_device; | 43 | struct device *this_device; |
44 | const char *devnode; | ||
44 | }; | 45 | }; |
45 | 46 | ||
46 | extern int misc_register(struct miscdevice * misc); | 47 | extern int misc_register(struct miscdevice * misc); |
diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h index b67bb5d7b221..8dc5123b6305 100644 --- a/include/linux/platform_device.h +++ b/include/linux/platform_device.h | |||
@@ -36,8 +36,8 @@ extern struct device platform_bus; | |||
36 | 36 | ||
37 | extern struct resource *platform_get_resource(struct platform_device *, unsigned int, unsigned int); | 37 | extern struct resource *platform_get_resource(struct platform_device *, unsigned int, unsigned int); |
38 | extern int platform_get_irq(struct platform_device *, unsigned int); | 38 | extern int platform_get_irq(struct platform_device *, unsigned int); |
39 | extern struct resource *platform_get_resource_byname(struct platform_device *, unsigned int, char *); | 39 | extern struct resource *platform_get_resource_byname(struct platform_device *, unsigned int, const char *); |
40 | extern int platform_get_irq_byname(struct platform_device *, char *); | 40 | extern int platform_get_irq_byname(struct platform_device *, const char *); |
41 | extern int platform_add_devices(struct platform_device **, int); | 41 | extern int platform_add_devices(struct platform_device **, int); |
42 | 42 | ||
43 | extern struct platform_device *platform_device_register_simple(const char *, int id, | 43 | extern struct platform_device *platform_device_register_simple(const char *, int id, |
diff --git a/include/linux/sched.h b/include/linux/sched.h index c900aa530070..7531b1c28201 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
@@ -674,7 +674,7 @@ struct user_struct { | |||
674 | struct task_group *tg; | 674 | struct task_group *tg; |
675 | #ifdef CONFIG_SYSFS | 675 | #ifdef CONFIG_SYSFS |
676 | struct kobject kobj; | 676 | struct kobject kobj; |
677 | struct work_struct work; | 677 | struct delayed_work work; |
678 | #endif | 678 | #endif |
679 | #endif | 679 | #endif |
680 | 680 | ||
diff --git a/include/linux/tracepoint.h b/include/linux/tracepoint.h index 14df7e635d43..b9dc4ca0246f 100644 --- a/include/linux/tracepoint.h +++ b/include/linux/tracepoint.h | |||
@@ -198,7 +198,7 @@ static inline void tracepoint_synchronize_unregister(void) | |||
198 | * * This is how the trace record is structured and will | 198 | * * This is how the trace record is structured and will |
199 | * * be saved into the ring buffer. These are the fields | 199 | * * be saved into the ring buffer. These are the fields |
200 | * * that will be exposed to user-space in | 200 | * * that will be exposed to user-space in |
201 | * * /debug/tracing/events/<*>/format. | 201 | * * /sys/kernel/debug/tracing/events/<*>/format. |
202 | * * | 202 | * * |
203 | * * The declared 'local variable' is called '__entry' | 203 | * * The declared 'local variable' is called '__entry' |
204 | * * | 204 | * * |
@@ -258,7 +258,7 @@ static inline void tracepoint_synchronize_unregister(void) | |||
258 | * tracepoint callback (this is used by programmatic plugins and | 258 | * tracepoint callback (this is used by programmatic plugins and |
259 | * can also by used by generic instrumentation like SystemTap), and | 259 | * can also by used by generic instrumentation like SystemTap), and |
260 | * it is also used to expose a structured trace record in | 260 | * it is also used to expose a structured trace record in |
261 | * /debug/tracing/events/. | 261 | * /sys/kernel/debug/tracing/events/. |
262 | */ | 262 | */ |
263 | 263 | ||
264 | #define TRACE_EVENT(name, proto, args, struct, assign, print) \ | 264 | #define TRACE_EVENT(name, proto, args, struct, assign, print) \ |
diff --git a/include/linux/usb.h b/include/linux/usb.h index 3aa2cd1f8d08..34cdfcac4555 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h | |||
@@ -869,6 +869,8 @@ struct usb_driver { | |||
869 | * struct usb_device_driver - identifies USB device driver to usbcore | 869 | * struct usb_device_driver - identifies USB device driver to usbcore |
870 | * @name: The driver name should be unique among USB drivers, | 870 | * @name: The driver name should be unique among USB drivers, |
871 | * and should normally be the same as the module name. | 871 | * and should normally be the same as the module name. |
872 | * @nodename: Callback to provide a naming hint for a possible | ||
873 | * device node to create. | ||
872 | * @probe: Called to see if the driver is willing to manage a particular | 874 | * @probe: Called to see if the driver is willing to manage a particular |
873 | * device. If it is, probe returns zero and uses dev_set_drvdata() | 875 | * device. If it is, probe returns zero and uses dev_set_drvdata() |
874 | * to associate driver-specific data with the device. If unwilling | 876 | * to associate driver-specific data with the device. If unwilling |
@@ -912,6 +914,7 @@ extern struct bus_type usb_bus_type; | |||
912 | */ | 914 | */ |
913 | struct usb_class_driver { | 915 | struct usb_class_driver { |
914 | char *name; | 916 | char *name; |
917 | char *(*nodename)(struct device *dev); | ||
915 | const struct file_operations *fops; | 918 | const struct file_operations *fops; |
916 | int minor_base; | 919 | int minor_base; |
917 | }; | 920 | }; |