summaryrefslogtreecommitdiff
path: root/drivers/staging/greybus/fw-management.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/staging/greybus/fw-management.c')
-rw-r--r--drivers/staging/greybus/fw-management.c19
1 files changed, 11 insertions, 8 deletions
diff --git a/drivers/staging/greybus/fw-management.c b/drivers/staging/greybus/fw-management.c
index cd9141e4b794..93137a3c4907 100644
--- a/drivers/staging/greybus/fw-management.c
+++ b/drivers/staging/greybus/fw-management.c
@@ -55,7 +55,10 @@ struct fw_mgmt {
*/
#define NUM_MINORS U8_MAX
-static struct class *fw_mgmt_class;
+static const struct class fw_mgmt_class = {
+ .name = "gb_fw_mgmt",
+};
+
static dev_t fw_mgmt_dev_num;
static DEFINE_IDA(fw_mgmt_minors_map);
static LIST_HEAD(fw_mgmt_list);
@@ -629,7 +632,7 @@ int gb_fw_mgmt_connection_init(struct gb_connection *connection)
goto err_remove_ida;
/* Add a soft link to the previously added char-dev within the bundle */
- fw_mgmt->class_device = device_create(fw_mgmt_class, fw_mgmt->parent,
+ fw_mgmt->class_device = device_create(&fw_mgmt_class, fw_mgmt->parent,
fw_mgmt->dev_num, NULL,
"gb-fw-mgmt-%d", minor);
if (IS_ERR(fw_mgmt->class_device)) {
@@ -664,7 +667,7 @@ void gb_fw_mgmt_connection_exit(struct gb_connection *connection)
fw_mgmt = gb_connection_get_data(connection);
- device_destroy(fw_mgmt_class, fw_mgmt->dev_num);
+ device_destroy(&fw_mgmt_class, fw_mgmt->dev_num);
cdev_del(&fw_mgmt->cdev);
ida_simple_remove(&fw_mgmt_minors_map, MINOR(fw_mgmt->dev_num));
@@ -696,9 +699,9 @@ int fw_mgmt_init(void)
{
int ret;
- fw_mgmt_class = class_create("gb_fw_mgmt");
- if (IS_ERR(fw_mgmt_class))
- return PTR_ERR(fw_mgmt_class);
+ ret = class_register(&fw_mgmt_class);
+ if (ret)
+ return ret;
ret = alloc_chrdev_region(&fw_mgmt_dev_num, 0, NUM_MINORS,
"gb_fw_mgmt");
@@ -708,13 +711,13 @@ int fw_mgmt_init(void)
return 0;
err_remove_class:
- class_destroy(fw_mgmt_class);
+ class_unregister(&fw_mgmt_class);
return ret;
}
void fw_mgmt_exit(void)
{
unregister_chrdev_region(fw_mgmt_dev_num, NUM_MINORS);
- class_destroy(fw_mgmt_class);
+ class_unregister(&fw_mgmt_class);
ida_destroy(&fw_mgmt_minors_map);
}