projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'stable/for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel...
[deliverable/linux.git]
/
drivers
/
rapidio
/
rio-sysfs.c
diff --git
a/drivers/rapidio/rio-sysfs.c
b/drivers/rapidio/rio-sysfs.c
index cdb005c0094df0b58362db0e6a4b462afd2f0621..eda41563d06d8a1f0e1fa65267fb9441bdf75b30 100644
(file)
--- a/
drivers/rapidio/rio-sysfs.c
+++ b/
drivers/rapidio/rio-sysfs.c
@@
-125,8
+125,7
@@
rio_read_config(struct file *filp, struct kobject *kobj,
struct bin_attribute *bin_attr,
char *buf, loff_t off, size_t count)
{
struct bin_attribute *bin_attr,
char *buf, loff_t off, size_t count)
{
- struct rio_dev *dev =
- to_rio_dev(container_of(kobj, struct device, kobj));
+ struct rio_dev *dev = to_rio_dev(kobj_to_dev(kobj));
unsigned int size = 0x100;
loff_t init_off = off;
u8 *data = (u8 *) buf;
unsigned int size = 0x100;
loff_t init_off = off;
u8 *data = (u8 *) buf;
@@
-197,8
+196,7
@@
rio_write_config(struct file *filp, struct kobject *kobj,
struct bin_attribute *bin_attr,
char *buf, loff_t off, size_t count)
{
struct bin_attribute *bin_attr,
char *buf, loff_t off, size_t count)
{
- struct rio_dev *dev =
- to_rio_dev(container_of(kobj, struct device, kobj));
+ struct rio_dev *dev = to_rio_dev(kobj_to_dev(kobj));
unsigned int size = count;
loff_t init_off = off;
u8 *data = (u8 *) buf;
unsigned int size = count;
loff_t init_off = off;
u8 *data = (u8 *) buf;
This page took
0.042633 seconds
and
5
git commands to generate.