diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-16 10:53:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-16 10:53:26 -0700 |
| commit | aa6865d836418eb2ba888a4cb1318a28e9aa2e0c (patch) | |
| tree | 6ade83b26618cb392ccf3318c9d05267b0eb5b53 /drivers | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux (diff) | |
| parent | m68k: Fix misspellings in comments. (diff) | |
| download | linux-dev-aa6865d836418eb2ba888a4cb1318a28e9aa2e0c.tar.xz linux-dev-aa6865d836418eb2ba888a4cb1318a28e9aa2e0c.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: Fix misspellings in comments.
m68k: Use conventional function parameters for do_sigreturn
zorro: Use kobj_to_dev()
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/zorro/zorro-sysfs.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/zorro/zorro-sysfs.c b/drivers/zorro/zorro-sysfs.c index 36b210f9b6b2..9282dbf5abdb 100644 --- a/drivers/zorro/zorro-sysfs.c +++ b/drivers/zorro/zorro-sysfs.c @@ -65,8 +65,7 @@ static ssize_t zorro_read_config(struct file *filp, struct kobject *kobj, struct bin_attribute *bin_attr, char *buf, loff_t off, size_t count) { - struct zorro_dev *z = to_zorro_dev(container_of(kobj, struct device, - kobj)); + struct zorro_dev *z = to_zorro_dev(kobj_to_dev(kobj)); struct ConfigDev cd; /* Construct a ConfigDev */ |