mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-27 14:14:24 +08:00
Input: adxl34x - use device core to create driver-specific device attributes
Instead of creating driver-specific device attributes with sysfs_create_group() have device core do this by setting up dev_groups pointer in the driver structure. Reviewed-by: Nuno Sa <nuno.sa@analog.com> Acked-by: Michael Hennerich <michael.hennerich@analog.com> Link: https://lore.kernel.org/r/20240610164301.1048482-1-dmitry.torokhov@gmail.com Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
parent
e17fb91cd4
commit
6f7e4f81f7
@ -132,6 +132,7 @@ MODULE_DEVICE_TABLE(of, adxl34x_of_id);
|
||||
static struct i2c_driver adxl34x_driver = {
|
||||
.driver = {
|
||||
.name = "adxl34x",
|
||||
.dev_groups = adxl34x_groups,
|
||||
.pm = pm_sleep_ptr(&adxl34x_pm),
|
||||
.of_match_table = adxl34x_of_id,
|
||||
},
|
||||
|
@ -97,6 +97,7 @@ static void adxl34x_spi_remove(struct spi_device *spi)
|
||||
static struct spi_driver adxl34x_driver = {
|
||||
.driver = {
|
||||
.name = "adxl34x",
|
||||
.dev_groups = adxl34x_groups,
|
||||
.pm = pm_sleep_ptr(&adxl34x_pm),
|
||||
},
|
||||
.probe = adxl34x_spi_probe,
|
||||
|
@ -664,6 +664,12 @@ static const struct attribute_group adxl34x_attr_group = {
|
||||
.attrs = adxl34x_attributes,
|
||||
};
|
||||
|
||||
const struct attribute_group *adxl34x_groups[] = {
|
||||
&adxl34x_attr_group,
|
||||
NULL
|
||||
};
|
||||
EXPORT_SYMBOL_GPL(adxl34x_groups);
|
||||
|
||||
static int adxl34x_input_open(struct input_dev *input)
|
||||
{
|
||||
struct adxl34x *ac = input_get_drvdata(input);
|
||||
@ -823,13 +829,9 @@ struct adxl34x *adxl34x_probe(struct device *dev, int irq,
|
||||
goto err_free_mem;
|
||||
}
|
||||
|
||||
err = sysfs_create_group(&dev->kobj, &adxl34x_attr_group);
|
||||
if (err)
|
||||
goto err_free_irq;
|
||||
|
||||
err = input_register_device(input_dev);
|
||||
if (err)
|
||||
goto err_remove_attr;
|
||||
goto err_free_irq;
|
||||
|
||||
AC_WRITE(ac, OFSX, pdata->x_axis_offset);
|
||||
ac->hwcal.x = pdata->x_axis_offset;
|
||||
@ -889,8 +891,6 @@ struct adxl34x *adxl34x_probe(struct device *dev, int irq,
|
||||
|
||||
return ac;
|
||||
|
||||
err_remove_attr:
|
||||
sysfs_remove_group(&dev->kobj, &adxl34x_attr_group);
|
||||
err_free_irq:
|
||||
free_irq(ac->irq, ac);
|
||||
err_free_mem:
|
||||
@ -903,7 +903,6 @@ EXPORT_SYMBOL_GPL(adxl34x_probe);
|
||||
|
||||
void adxl34x_remove(struct adxl34x *ac)
|
||||
{
|
||||
sysfs_remove_group(&ac->dev->kobj, &adxl34x_attr_group);
|
||||
free_irq(ac->irq, ac);
|
||||
input_unregister_device(ac->input);
|
||||
dev_dbg(ac->dev, "unregistered accelerometer\n");
|
||||
|
@ -26,5 +26,6 @@ struct adxl34x *adxl34x_probe(struct device *dev, int irq,
|
||||
void adxl34x_remove(struct adxl34x *ac);
|
||||
|
||||
extern const struct dev_pm_ops adxl34x_pm;
|
||||
extern const struct attribute_group *adxl34x_groups[];
|
||||
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user