s390/ctc: cleanup drv attr usage
Rename attributes of the ctcm_group_driver. Also get rid of the call to driver_remove_file. Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>hifive-unleashed-5.1
parent
9814fdfbec
commit
330ce1b082
|
@ -1786,17 +1786,15 @@ static ssize_t ctcm_driver_group_store(struct device_driver *ddrv,
|
||||||
}
|
}
|
||||||
static DRIVER_ATTR(group, 0200, NULL, ctcm_driver_group_store);
|
static DRIVER_ATTR(group, 0200, NULL, ctcm_driver_group_store);
|
||||||
|
|
||||||
static struct attribute *ctcm_group_attrs[] = {
|
static struct attribute *ctcm_drv_attrs[] = {
|
||||||
&driver_attr_group.attr,
|
&driver_attr_group.attr,
|
||||||
NULL,
|
NULL,
|
||||||
};
|
};
|
||||||
|
static struct attribute_group ctcm_drv_attr_group = {
|
||||||
static struct attribute_group ctcm_group_attr_group = {
|
.attrs = ctcm_drv_attrs,
|
||||||
.attrs = ctcm_group_attrs,
|
|
||||||
};
|
};
|
||||||
|
static const struct attribute_group *ctcm_drv_attr_groups[] = {
|
||||||
static const struct attribute_group *ctcm_group_attr_groups[] = {
|
&ctcm_drv_attr_group,
|
||||||
&ctcm_group_attr_group,
|
|
||||||
NULL,
|
NULL,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -1812,7 +1810,6 @@ static const struct attribute_group *ctcm_group_attr_groups[] = {
|
||||||
*/
|
*/
|
||||||
static void __exit ctcm_exit(void)
|
static void __exit ctcm_exit(void)
|
||||||
{
|
{
|
||||||
driver_remove_file(&ctcm_group_driver.driver, &driver_attr_group);
|
|
||||||
ccwgroup_driver_unregister(&ctcm_group_driver);
|
ccwgroup_driver_unregister(&ctcm_group_driver);
|
||||||
ccw_driver_unregister(&ctcm_ccw_driver);
|
ccw_driver_unregister(&ctcm_ccw_driver);
|
||||||
root_device_unregister(ctcm_root_dev);
|
root_device_unregister(ctcm_root_dev);
|
||||||
|
@ -1850,7 +1847,7 @@ static int __init ctcm_init(void)
|
||||||
ret = ccw_driver_register(&ctcm_ccw_driver);
|
ret = ccw_driver_register(&ctcm_ccw_driver);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto ccw_err;
|
goto ccw_err;
|
||||||
ctcm_group_driver.driver.groups = ctcm_group_attr_groups;
|
ctcm_group_driver.driver.groups = ctcm_drv_attr_groups;
|
||||||
ret = ccwgroup_driver_register(&ctcm_group_driver);
|
ret = ccwgroup_driver_register(&ctcm_group_driver);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto ccwgroup_err;
|
goto ccwgroup_err;
|
||||||
|
|
Loading…
Reference in New Issue