diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-21 08:56:58 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-21 07:36:33 -0700 |
| commit | 388dba30471c236a290c4082bce5f2b5cd1a7a06 (patch) | |
| tree | 3c71d6cea401158ed2da5bfc40ee22db9eb00e63 | |
| parent | ebc79c4f8da0f92efa968e0328f32334a2ce80cf (diff) | |
| download | linux-388dba30471c236a290c4082bce5f2b5cd1a7a06.tar.gz linux-388dba30471c236a290c4082bce5f2b5cd1a7a06.tar.bz2 linux-388dba30471c236a290c4082bce5f2b5cd1a7a06.zip | |
Driver-Core: fix devnode callbacks for dabusb and industrialio
The build of the dabusb driver broke:
drivers/media/video/dabusb.c:758: error: unknown field 'nodename' specified in initializer
drivers/media/video/dabusb.c:758: warning: initialization from incompatible pointer type
make[3]: *** wait: No child processes. Stop.
Due to this commit:
e454cea: Driver-Core: extend devnode callbacks to provide permissions
Missing the dabusb driver's dabusb_nodename() callback.
Similar issues with the iio/industrialio driver in staging, pointed out
and patched by Jean Delvare.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Industrialio-parts-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | drivers/media/video/dabusb.c | 4 | ||||
| -rw-r--r-- | drivers/staging/iio/industrialio-core.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/dabusb.c b/drivers/media/video/dabusb.c index 0664d111085f..ee43876adb06 100644 --- a/drivers/media/video/dabusb.c +++ b/drivers/media/video/dabusb.c @@ -748,14 +748,14 @@ static const struct file_operations dabusb_fops = .release = dabusb_release, }; -static char *dabusb_nodename(struct device *dev) +static char *dabusb_devnode(struct device *dev, mode_t *mode) { return kasprintf(GFP_KERNEL, "usb/%s", dev_name(dev)); } static struct usb_class_driver dabusb_class = { .name = "dabusb%d", - .nodename = dabusb_nodename, + .devnode = dabusb_devnode, .fops = &dabusb_fops, .minor_base = DABUSB_MINOR, }; diff --git a/drivers/staging/iio/industrialio-core.c b/drivers/staging/iio/industrialio-core.c index 660a9c1a1f3f..1fa18f255814 100644 --- a/drivers/staging/iio/industrialio-core.c +++ b/drivers/staging/iio/industrialio-core.c @@ -39,14 +39,14 @@ dev_t iio_devt; EXPORT_SYMBOL(iio_devt); #define IIO_DEV_MAX 256 -static char *iio_nodename(struct device *dev) +static char *iio_devnode(struct device *dev, mode_t *mode) { return kasprintf(GFP_KERNEL, "iio/%s", dev_name(dev)); } struct class iio_class = { .name = "iio", - .nodename = iio_nodename, + .devnode = iio_devnode, }; EXPORT_SYMBOL(iio_class); |