diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-27 00:54:43 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-27 00:54:43 +0300 |
| commit | 360db2b422f16305e5b8523b4b730521fbc8fb5d (patch) | |
| tree | bd3e782b754fb70524f6fc1e3bcdfb96e6ec0ce5 | |
| parent | 8b83369ddcb3fb9cab5c1088987ce477565bb630 (diff) | |
| parent | 4ce6b242b78d355ba899f1b16c6bfcd43df155a0 (diff) | |
| download | linux-360db2b422f16305e5b8523b4b730521fbc8fb5d.tar.xz | |
Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux
Pull pcmcia update from Dominik Brodowski:
"Improve the use of the kobj API in the core of the Linux PCMCIA
subsystem"
* 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux:
pcmcia: Switch to using the new API kobj_to_dev()
| -rw-r--r-- | drivers/pcmcia/cistpl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pcmcia/cistpl.c b/drivers/pcmcia/cistpl.c index cf109d9a1112..e6939103991b 100644 --- a/drivers/pcmcia/cistpl.c +++ b/drivers/pcmcia/cistpl.c @@ -1554,7 +1554,7 @@ static ssize_t pccard_show_cis(struct file *filp, struct kobject *kobj, if (off + count > size) count = size - off; - s = to_socket(container_of(kobj, struct device, kobj)); + s = to_socket(kobj_to_dev(kobj)); if (!(s->state & SOCKET_PRESENT)) return -ENODEV; @@ -1581,7 +1581,7 @@ static ssize_t pccard_store_cis(struct file *filp, struct kobject *kobj, if (error) return error; - s = to_socket(container_of(kobj, struct device, kobj)); + s = to_socket(kobj_to_dev(kobj)); if (off) return -EINVAL; |