summaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2021-02-26 13:54:43 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2021-02-26 13:54:43 -0800
commit360db2b422f16305e5b8523b4b730521fbc8fb5d (patch)
treebd3e782b754fb70524f6fc1e3bcdfb96e6ec0ce5 /drivers/pcmcia
parent8b83369ddcb3fb9cab5c1088987ce477565bb630 (diff)
parent4ce6b242b78d355ba899f1b16c6bfcd43df155a0 (diff)
downloadlinux-360db2b422f16305e5b8523b4b730521fbc8fb5d.tar.gz
linux-360db2b422f16305e5b8523b4b730521fbc8fb5d.tar.bz2
linux-360db2b422f16305e5b8523b4b730521fbc8fb5d.zip
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()
Diffstat (limited to 'drivers/pcmcia')
-rw-r--r--drivers/pcmcia/cistpl.c4
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;