Commit 70359c4a authored by Dmitry Torokhov's avatar Dmitry Torokhov Committed by Greg Kroah-Hartman

rapidio: use is_visible() to hide switch-specific attributes

Instead of creating switch-specific attributes by hand, implement
is_visible() method of attribute group and hide them when dealing with
non-switch devices. This will ensure that all attributes are created
together, before userspace gets notified of new device.

Also, remove rio-sysfs.c from list of files that are scanned when compiling
RapiodIO documentations as it no longer has any structured comments, and
leaving it in leads to warning when building docs.
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent dde04eb1
...@@ -128,9 +128,6 @@ ...@@ -128,9 +128,6 @@
</sect1> </sect1>
<sect1 id="Device_model_support"><title>Device model support</title> <sect1 id="Device_model_support"><title>Device model support</title>
!Idrivers/rapidio/rio-driver.c !Idrivers/rapidio/rio-driver.c
</sect1>
<sect1 id="Sysfs_support"><title>Sysfs support</title>
!Idrivers/rapidio/rio-sysfs.c
</sect1> </sect1>
<sect1 id="PPC32_support"><title>PPC32 support</title> <sect1 id="PPC32_support"><title>PPC32 support</title>
!Iarch/powerpc/sysdev/fsl_rio.c !Iarch/powerpc/sysdev/fsl_rio.c
......
...@@ -108,15 +108,11 @@ static struct attribute *rio_dev_attrs[] = { ...@@ -108,15 +108,11 @@ static struct attribute *rio_dev_attrs[] = {
&dev_attr_lprev.attr, &dev_attr_lprev.attr,
&dev_attr_destid.attr, &dev_attr_destid.attr,
&dev_attr_modalias.attr, &dev_attr_modalias.attr,
NULL,
};
static const struct attribute_group rio_dev_group = {
.attrs = rio_dev_attrs,
};
const struct attribute_group *rio_dev_groups[] = { /* Switch-only attributes */
&rio_dev_group, &dev_attr_routes.attr,
&dev_attr_lnext.attr,
&dev_attr_hopcount.attr,
NULL, NULL,
}; };
...@@ -259,46 +255,40 @@ static struct bin_attribute rio_config_attr = { ...@@ -259,46 +255,40 @@ static struct bin_attribute rio_config_attr = {
.write = rio_write_config, .write = rio_write_config,
}; };
/** static struct bin_attribute *rio_dev_bin_attrs[] = {
* rio_create_sysfs_dev_files - create RIO specific sysfs files &rio_config_attr,
* @rdev: device whose entries should be created NULL,
* };
* Create files when @rdev is added to sysfs.
*/
int rio_create_sysfs_dev_files(struct rio_dev *rdev)
{
int err = 0;
err = device_create_bin_file(&rdev->dev, &rio_config_attr);
if (!err && (rdev->pef & RIO_PEF_SWITCH)) { static umode_t rio_dev_is_attr_visible(struct kobject *kobj,
err |= device_create_file(&rdev->dev, &dev_attr_routes); struct attribute *attr, int n)
err |= device_create_file(&rdev->dev, &dev_attr_lnext); {
err |= device_create_file(&rdev->dev, &dev_attr_hopcount); struct rio_dev *rdev = to_rio_dev(kobj_to_dev(kobj));
umode_t mode = attr->mode;
if (!(rdev->pef & RIO_PEF_SWITCH) &&
(attr == &dev_attr_routes.attr ||
attr == &dev_attr_lnext.attr ||
attr == &dev_attr_hopcount.attr)) {
/*
* Hide switch-specific attributes for a non-switch device.
*/
mode = 0;
} }
if (err) return mode;
pr_warning("RIO: Failed to create attribute file(s) for %s\n",
rio_name(rdev));
return err;
} }
/** static const struct attribute_group rio_dev_group = {
* rio_remove_sysfs_dev_files - cleanup RIO specific sysfs files .attrs = rio_dev_attrs,
* @rdev: device whose entries we should free .is_visible = rio_dev_is_attr_visible,
* .bin_attrs = rio_dev_bin_attrs,
* Cleanup when @rdev is removed from sysfs. };
*/
void rio_remove_sysfs_dev_files(struct rio_dev *rdev) const struct attribute_group *rio_dev_groups[] = {
{ &rio_dev_group,
device_remove_bin_file(&rdev->dev, &rio_config_attr); NULL,
if (rdev->pef & RIO_PEF_SWITCH) { };
device_remove_file(&rdev->dev, &dev_attr_routes);
device_remove_file(&rdev->dev, &dev_attr_lnext);
device_remove_file(&rdev->dev, &dev_attr_hopcount);
}
}
static ssize_t bus_scan_store(struct bus_type *bus, const char *buf, static ssize_t bus_scan_store(struct bus_type *bus, const char *buf,
size_t count) size_t count)
......
...@@ -192,8 +192,6 @@ int rio_add_device(struct rio_dev *rdev) ...@@ -192,8 +192,6 @@ int rio_add_device(struct rio_dev *rdev)
} }
spin_unlock(&rio_global_list_lock); spin_unlock(&rio_global_list_lock);
rio_create_sysfs_dev_files(rdev);
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(rio_add_device); EXPORT_SYMBOL_GPL(rio_add_device);
...@@ -220,7 +218,6 @@ void rio_del_device(struct rio_dev *rdev, enum rio_device_state state) ...@@ -220,7 +218,6 @@ void rio_del_device(struct rio_dev *rdev, enum rio_device_state state)
} }
} }
spin_unlock(&rio_global_list_lock); spin_unlock(&rio_global_list_lock);
rio_remove_sysfs_dev_files(rdev);
device_unregister(&rdev->dev); device_unregister(&rdev->dev);
} }
EXPORT_SYMBOL_GPL(rio_del_device); EXPORT_SYMBOL_GPL(rio_del_device);
......
...@@ -27,8 +27,6 @@ extern u32 rio_mport_get_efb(struct rio_mport *port, int local, u16 destid, ...@@ -27,8 +27,6 @@ extern u32 rio_mport_get_efb(struct rio_mport *port, int local, u16 destid,
u8 hopcount, u32 from); u8 hopcount, u32 from);
extern int rio_mport_chk_dev_access(struct rio_mport *mport, u16 destid, extern int rio_mport_chk_dev_access(struct rio_mport *mport, u16 destid,
u8 hopcount); u8 hopcount);
extern int rio_create_sysfs_dev_files(struct rio_dev *rdev);
extern void rio_remove_sysfs_dev_files(struct rio_dev *rdev);
extern int rio_lock_device(struct rio_mport *port, u16 destid, extern int rio_lock_device(struct rio_mport *port, u16 destid,
u8 hopcount, int wait_ms); u8 hopcount, int wait_ms);
extern int rio_unlock_device(struct rio_mport *port, u16 destid, u8 hopcount); extern int rio_unlock_device(struct rio_mport *port, u16 destid, u8 hopcount);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment