|
14 | 14 | #include <linux/dmi.h>
|
15 | 15 | #include <linux/module.h>
|
16 | 16 | #include <linux/types.h>
|
17 |
| -#include <linux/platform_device.h> |
18 | 17 | #include <linux/interrupt.h>
|
19 | 18 | #include <linux/input.h>
|
20 | 19 | #include <linux/delay.h>
|
@@ -230,7 +229,7 @@ static int lis3lv02d_get_pwron_wait(struct lis3lv02d *lis3)
|
230 | 229 | return 0;
|
231 | 230 | }
|
232 | 231 |
|
233 |
| - dev_err(&lis3->pdev->dev, "Error unknown odrs-index: %d\n", odr_idx); |
| 232 | + dev_err(&lis3->fdev->dev, "Error unknown odrs-index: %d\n", odr_idx); |
234 | 233 | return -ENXIO;
|
235 | 234 | }
|
236 | 235 |
|
@@ -694,7 +693,7 @@ int lis3lv02d_joystick_enable(struct lis3lv02d *lis3)
|
694 | 693 | input_dev->phys = DRIVER_NAME "/input0";
|
695 | 694 | input_dev->id.bustype = BUS_HOST;
|
696 | 695 | input_dev->id.vendor = 0;
|
697 |
| - input_dev->dev.parent = &lis3->pdev->dev; |
| 696 | + input_dev->dev.parent = &lis3->fdev->dev; |
698 | 697 |
|
699 | 698 | input_dev->open = lis3lv02d_joystick_open;
|
700 | 699 | input_dev->close = lis3lv02d_joystick_close;
|
@@ -855,32 +854,27 @@ static DEVICE_ATTR(position, S_IRUGO, lis3lv02d_position_show, NULL);
|
855 | 854 | static DEVICE_ATTR(rate, S_IRUGO | S_IWUSR, lis3lv02d_rate_show,
|
856 | 855 | lis3lv02d_rate_set);
|
857 | 856 |
|
858 |
| -static struct attribute *lis3lv02d_attributes[] = { |
| 857 | +static struct attribute *lis3lv02d_attrs[] = { |
859 | 858 | &dev_attr_selftest.attr,
|
860 | 859 | &dev_attr_position.attr,
|
861 | 860 | &dev_attr_rate.attr,
|
862 | 861 | NULL
|
863 | 862 | };
|
864 |
| - |
865 |
| -static const struct attribute_group lis3lv02d_attribute_group = { |
866 |
| - .attrs = lis3lv02d_attributes |
867 |
| -}; |
868 |
| - |
| 863 | +ATTRIBUTE_GROUPS(lis3lv02d); |
869 | 864 |
|
870 | 865 | static int lis3lv02d_add_fs(struct lis3lv02d *lis3)
|
871 | 866 | {
|
872 |
| - lis3->pdev = platform_device_register_simple(DRIVER_NAME, -1, NULL, 0); |
873 |
| - if (IS_ERR(lis3->pdev)) |
874 |
| - return PTR_ERR(lis3->pdev); |
| 867 | + lis3->fdev = faux_device_create_with_groups(DRIVER_NAME, NULL, NULL, lis3lv02d_groups); |
| 868 | + if (!lis3->fdev) |
| 869 | + return -ENODEV; |
875 | 870 |
|
876 |
| - platform_set_drvdata(lis3->pdev, lis3); |
877 |
| - return sysfs_create_group(&lis3->pdev->dev.kobj, &lis3lv02d_attribute_group); |
| 871 | + faux_device_set_drvdata(lis3->fdev, lis3); |
| 872 | + return 0; |
878 | 873 | }
|
879 | 874 |
|
880 | 875 | void lis3lv02d_remove_fs(struct lis3lv02d *lis3)
|
881 | 876 | {
|
882 |
| - sysfs_remove_group(&lis3->pdev->dev.kobj, &lis3lv02d_attribute_group); |
883 |
| - platform_device_unregister(lis3->pdev); |
| 877 | + faux_device_destroy(lis3->fdev); |
884 | 878 | if (lis3->pm_dev) {
|
885 | 879 | /* Barrier after the sysfs remove */
|
886 | 880 | pm_runtime_barrier(lis3->pm_dev);
|
|
0 commit comments