|
31 | 31 | /* Arbitrary bounded size for the event queue */ |
32 | 32 | #define CROS_MAX_EVENT_LEN PAGE_SIZE |
33 | 33 |
|
34 | | -struct chardev_data { |
35 | | - struct cros_ec_dev *ec_dev; |
36 | | - struct miscdevice misc; |
37 | | -}; |
38 | | - |
39 | 34 | struct chardev_priv { |
40 | 35 | struct cros_ec_dev *ec_dev; |
41 | 36 | struct notifier_block notifier; |
@@ -379,29 +374,28 @@ static int cros_ec_chardev_probe(struct platform_device *pdev) |
379 | 374 | { |
380 | 375 | struct cros_ec_dev *ec_dev = dev_get_drvdata(pdev->dev.parent); |
381 | 376 | struct cros_ec_platform *ec_platform = dev_get_platdata(ec_dev->dev); |
382 | | - struct chardev_data *data; |
| 377 | + struct miscdevice *misc; |
383 | 378 |
|
384 | 379 | /* Create a char device: we want to create it anew */ |
385 | | - data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); |
386 | | - if (!data) |
| 380 | + misc = devm_kzalloc(&pdev->dev, sizeof(*misc), GFP_KERNEL); |
| 381 | + if (!misc) |
387 | 382 | return -ENOMEM; |
388 | 383 |
|
389 | | - data->ec_dev = ec_dev; |
390 | | - data->misc.minor = MISC_DYNAMIC_MINOR; |
391 | | - data->misc.fops = &chardev_fops; |
392 | | - data->misc.name = ec_platform->ec_name; |
393 | | - data->misc.parent = pdev->dev.parent; |
| 384 | + misc->minor = MISC_DYNAMIC_MINOR; |
| 385 | + misc->fops = &chardev_fops; |
| 386 | + misc->name = ec_platform->ec_name; |
| 387 | + misc->parent = pdev->dev.parent; |
394 | 388 |
|
395 | | - dev_set_drvdata(&pdev->dev, data); |
| 389 | + dev_set_drvdata(&pdev->dev, misc); |
396 | 390 |
|
397 | | - return misc_register(&data->misc); |
| 391 | + return misc_register(misc); |
398 | 392 | } |
399 | 393 |
|
400 | 394 | static void cros_ec_chardev_remove(struct platform_device *pdev) |
401 | 395 | { |
402 | | - struct chardev_data *data = dev_get_drvdata(&pdev->dev); |
| 396 | + struct miscdevice *misc = dev_get_drvdata(&pdev->dev); |
403 | 397 |
|
404 | | - misc_deregister(&data->misc); |
| 398 | + misc_deregister(misc); |
405 | 399 | } |
406 | 400 |
|
407 | 401 | static const struct platform_device_id cros_ec_chardev_id[] = { |
|
0 commit comments