diff options
| author | Deepak Saxena <dsaxena@laptop.org> | 2008-09-22 15:19:35 -0700 |
|---|---|---|
| committer | Deepak Saxena <dsaxena@laptop.org> | 2008-09-22 15:19:35 -0700 |
| commit | 38b5fedf917fc36d68f9712541d46dbccb4d7cb1 (patch) | |
| tree | cf2f00872e3b5329d3de69e4ad04012588129c58 /drivers/input/mouse/psmouse.h | |
| parent | f2c3fe6773a10211fb125a493d061d7365ec8e68 (diff) | |
| download | lwn-763.tar.gz lwn-763.zip | |
This reverts commit 93970329291a9ff73301a96a27c4af274f096835.
The original commit contains changes to psmouse-base.c and
olpc.c that mention an upstream fix and fixing a low power
toggle bug but the commit does not point to an upstream source
or describe what the bug is. Upon searching lkml, it looks
like this commit is a merge of several patches sent upstream.
As this has not received wide-spread testing yet, I am
reverting for now and we can add the changes back in
properly as separate commits after the 8.2 release.
Signed-off-by: Deepak Saxena <dsaxena@laptop.org>
Diffstat (limited to 'drivers/input/mouse/psmouse.h')
| -rw-r--r-- | drivers/input/mouse/psmouse.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h index a573b7aa3d85..67af5a50ec4c 100644 --- a/drivers/input/mouse/psmouse.h +++ b/drivers/input/mouse/psmouse.h @@ -39,7 +39,7 @@ struct psmouse { void *private; struct input_dev *dev; struct ps2dev ps2dev; - struct delayed_work resync_work; + struct work_struct resync_work; char *vendor; char *name; unsigned char packet[8]; @@ -93,8 +93,6 @@ enum psmouse_type { PSMOUSE_AUTO /* This one should always be last */ }; -void psmouse_queue_work(struct psmouse *psmouse, struct delayed_work *work, - unsigned long delay); int psmouse_sliced_command(struct psmouse *psmouse, unsigned char command); int psmouse_reset(struct psmouse *psmouse); void psmouse_set_resolution(struct psmouse *psmouse, unsigned int resolution); @@ -108,7 +106,6 @@ 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) @@ -117,7 +114,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, _protect) \ +#define PSMOUSE_DEFINE_ATTR(_name, _mode, _data, _show, _set) \ 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 = { \ @@ -132,10 +129,6 @@ 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 */ |