mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-15 15:15:47 +00:00
98ceb75c7c
Some code that is in ams_exit() (the module exit code) should instead be called when the device (not module) is removed. It probably doesn't make much of a difference in the PMU case, but in the I2C case it does matter. I make no guarantee that my fix isn't racy, I'm not familiar enough with the ams driver code to tell for sure. Signed-off-by: Jean Delvare <khali@linux-fr.org> Tested-by: Christian Kujau <lists@nerdbynature.de> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Stelian Pop <stelian@popies.net> Cc: Michael Hanselmann <linux-kernel@hansmi.ch> Cc: stable@kernel.org Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
70 lines
1.4 KiB
C
70 lines
1.4 KiB
C
#include <linux/i2c.h>
|
|
#include <linux/input-polldev.h>
|
|
#include <linux/kthread.h>
|
|
#include <linux/mutex.h>
|
|
#include <linux/spinlock.h>
|
|
#include <linux/types.h>
|
|
#include <linux/of_device.h>
|
|
|
|
enum ams_irq {
|
|
AMS_IRQ_FREEFALL = 0x01,
|
|
AMS_IRQ_SHOCK = 0x02,
|
|
AMS_IRQ_GLOBAL = 0x04,
|
|
AMS_IRQ_ALL =
|
|
AMS_IRQ_FREEFALL |
|
|
AMS_IRQ_SHOCK |
|
|
AMS_IRQ_GLOBAL,
|
|
};
|
|
|
|
struct ams {
|
|
/* Locks */
|
|
spinlock_t irq_lock;
|
|
struct mutex lock;
|
|
|
|
/* General properties */
|
|
struct device_node *of_node;
|
|
struct of_device *of_dev;
|
|
char has_device;
|
|
char vflag;
|
|
u32 orient1;
|
|
u32 orient2;
|
|
|
|
/* Interrupt worker */
|
|
struct work_struct worker;
|
|
u8 worker_irqs;
|
|
|
|
/* Implementation
|
|
*
|
|
* Only call these functions with the main lock held.
|
|
*/
|
|
void (*exit)(void);
|
|
|
|
void (*get_xyz)(s8 *x, s8 *y, s8 *z);
|
|
u8 (*get_vendor)(void);
|
|
|
|
void (*clear_irq)(enum ams_irq reg);
|
|
|
|
#ifdef CONFIG_SENSORS_AMS_I2C
|
|
/* I2C properties */
|
|
struct i2c_client *i2c_client;
|
|
#endif
|
|
|
|
/* Joystick emulation */
|
|
struct input_polled_dev *idev;
|
|
__u16 bustype;
|
|
|
|
/* calibrated null values */
|
|
int xcalib, ycalib, zcalib;
|
|
};
|
|
|
|
extern struct ams ams_info;
|
|
|
|
extern void ams_sensors(s8 *x, s8 *y, s8 *z);
|
|
extern int ams_sensor_attach(void);
|
|
extern void ams_sensor_detach(void);
|
|
|
|
extern int ams_pmu_init(struct device_node *np);
|
|
extern int ams_i2c_init(struct device_node *np);
|
|
|
|
extern int ams_input_init(void);
|
|
extern void ams_input_exit(void);
|