diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-20 20:20:23 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-20 20:20:23 -0400 |
| commit | 57312b75aa06b09c28acd9c5a9c70827da3696d2 (patch) | |
| tree | c35b230739f4b9a8e50b1651854ad830ca2b9fdf /include | |
| parent | 1b5e2a7e23439c13f73cacab1cf227f30cb9ae9f (diff) | |
| parent | 24b42566c3fcbb5a9011d1446783d0f5844ccd45 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6:
SCSI: fix race in device_create
USB: Core: fix race in device_create
USB: Phidget: fix race in device_create
s390: fix race in device_create
SOUND: fix race in device_create
UIO: fix race in device_create
Power Supply: fix race in device_create
LEDS: fix race in device_create
IB: fix race in device_create
ide: fix race in device_create
fbdev: fix race in device_create
mm: bdi: fix race in bdi_class device creation
Driver core: add device_create_vargs and device_create_drvdata
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/device.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index 15e9fa3ad3af..14616e80213c 100644 --- a/include/linux/device.h +++ b/include/linux/device.h | |||
| @@ -449,9 +449,21 @@ extern int __must_check device_reprobe(struct device *dev); | |||
| 449 | /* | 449 | /* |
| 450 | * Easy functions for dynamically creating devices on the fly | 450 | * Easy functions for dynamically creating devices on the fly |
| 451 | */ | 451 | */ |
| 452 | extern struct device *device_create_vargs(struct class *cls, | ||
| 453 | struct device *parent, | ||
| 454 | dev_t devt, | ||
| 455 | void *drvdata, | ||
| 456 | const char *fmt, | ||
| 457 | va_list vargs); | ||
| 452 | extern struct device *device_create(struct class *cls, struct device *parent, | 458 | extern struct device *device_create(struct class *cls, struct device *parent, |
| 453 | dev_t devt, const char *fmt, ...) | 459 | dev_t devt, const char *fmt, ...) |
| 454 | __attribute__((format(printf, 4, 5))); | 460 | __attribute__((format(printf, 4, 5))); |
| 461 | extern struct device *device_create_drvdata(struct class *cls, | ||
| 462 | struct device *parent, | ||
| 463 | dev_t devt, | ||
| 464 | void *drvdata, | ||
| 465 | const char *fmt, ...) | ||
| 466 | __attribute__((format(printf, 5, 6))); | ||
| 455 | extern void device_destroy(struct class *cls, dev_t devt); | 467 | extern void device_destroy(struct class *cls, dev_t devt); |
| 456 | 468 | ||
| 457 | /* | 469 | /* |