Commit 68d48221 authored by Andres Salomon's avatar Andres Salomon Committed by Dmitry Torokhov
Browse files

Input: psmouse - tweak PSMOUSE_DEFINE_ATTR to support raw set callbacks 



We want to support attr->set callbacks that may need psmouse->state to
not be updated, or may want to manually deal w/ enabling and disabling
the device.  To do that, we create __PSMOUSE_DEFINE_ATTR which enables
us to set a 'protect' argument specifying whether or not the set
callback should be protected with psmouse_disable and state setting.

Signed-off-by: default avatarAndres Salomon <dilinger@debian.org>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 8bf020ee

drivers/input/mouse/psmouse-base.c

+17 −13
Original line number Diff line number Diff line
@@ -1401,6 +1401,7 @@ ssize_t psmouse_attr_set_helper(struct device *dev, struct device_attribute *dev 


	psmouse = serio_get_drvdata(serio);



	if (attr->protect) {

		if (psmouse->state == PSMOUSE_IGNORE) {

			retval = -ENODEV;

			goto out_unlock;
@@ -1412,14 +1413,17 @@ ssize_t psmouse_attr_set_helper(struct device *dev, struct device_attribute *dev 
		}



		psmouse_deactivate(psmouse);

	}



	retval = attr->set(psmouse, attr->data, buf, count);



	if (attr->protect) {

		if (retval != -ENODEV)

			psmouse_activate(psmouse);



		if (parent)

			psmouse_activate(parent);

	}



 out_unlock:

	mutex_unlock(&psmouse_mutex);

drivers/input/mouse/psmouse.h

+6 −1
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ struct psmouse_attribute { 
	ssize_t (*show)(struct psmouse *psmouse, void *data, char *buf);

	ssize_t (*set)(struct psmouse *psmouse, void *data,

			const char *buf, size_t count);

	int protect;

};

#define to_psmouse_attr(a)	container_of((a), struct psmouse_attribute, dattr)
@@ -114,7 +115,7 @@ ssize_t psmouse_attr_show_helper(struct device *dev, struct device_attribute *at 
ssize_t psmouse_attr_set_helper(struct device *dev, struct device_attribute *attr,

				const char *buf, size_t count);



#define PSMOUSE_DEFINE_ATTR(_name, _mode, _data, _show, _set)			\

#define __PSMOUSE_DEFINE_ATTR(_name, _mode, _data, _show, _set, _protect)	\

static ssize_t _show(struct psmouse *, void *data, char *);			\

static ssize_t _set(struct psmouse *, void *data, const char *, size_t);	\

static struct psmouse_attribute psmouse_attr_##_name = {			\
@@ -129,6 +130,10 @@ static struct psmouse_attribute psmouse_attr_##_name = { \ 
	.data	= _data,							\

	.show	= _show,							\

	.set	= _set,								\

	.protect = _protect,							\

}



#define PSMOUSE_DEFINE_ATTR(_name, _mode, _data, _show, _set)	\

		__PSMOUSE_DEFINE_ATTR(_name, _mode, _data, _show, _set, 1)



#endif /* _PSMOUSE_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE