diff options
| author | Sammy He <r62914@freescale.com> | 2011-03-02 20:45:53 +0800 |
|---|---|---|
| committer | Andy Voltz <andy.voltz@timesys.com> | 2011-06-01 13:20:59 -0400 |
| commit | 8706596bfee5928a27ee0215ca972f6c3e6e2389 (patch) | |
| tree | 063527f2cd4cbd20f4daa2d14de33b3992f47beb /drivers/hwmon | |
| parent | 8bfdb6831215156b8c02276c760f60cc5a47be81 (diff) | |
ENGR00140036 Set init max poll delay time in mma sensor driver
1. Set initial max poll delay time in mma8450 and mma8451
accelerometer sensor driver. And remove one build warning.
2. Remove dev parent set.
Signed-off-by: Sammy He <r62914@freescale.com>
Diffstat (limited to 'drivers/hwmon')
| -rwxr-xr-x | drivers/hwmon/mxc_mma8450.c | 4 | ||||
| -rw-r--r-- | drivers/hwmon/mxc_mma8451.c | 12 |
2 files changed, 9 insertions, 7 deletions
diff --git a/drivers/hwmon/mxc_mma8450.c b/drivers/hwmon/mxc_mma8450.c index 3d4c1ef1f4d9..214df139a866 100755 --- a/drivers/hwmon/mxc_mma8450.c +++ b/drivers/hwmon/mxc_mma8450.c @@ -45,7 +45,9 @@ #define MMA8450_I2C_ADDR 0x1C #define MMA8450_ID 0xC6 #define MMA8450_STATUS 0x00 + #define MODE_CHANGE_DELAY_MS 100 +#define POLL_INTERVAL_MAX 500 #define POLL_INTERVAL 100 #define INPUT_FUZZ 32 #define INPUT_FLAT 32 @@ -284,10 +286,10 @@ static int __devinit mma8450_probe(struct i2c_client *client, } mma8450_idev->poll = mma8450_dev_poll; mma8450_idev->poll_interval = POLL_INTERVAL; + mma8450_idev->poll_interval_max = POLL_INTERVAL_MAX; idev = mma8450_idev->input; idev->name = MMA8450_DRV_NAME; idev->id.bustype = BUS_I2C; - idev->dev.parent = &client->dev; idev->evbit[0] = BIT_MASK(EV_ABS); input_set_abs_params(idev, ABS_X, -8192, 8191, INPUT_FUZZ, INPUT_FLAT); diff --git a/drivers/hwmon/mxc_mma8451.c b/drivers/hwmon/mxc_mma8451.c index 901be5cedb37..44817614b7a5 100644 --- a/drivers/hwmon/mxc_mma8451.c +++ b/drivers/hwmon/mxc_mma8451.c @@ -2,7 +2,7 @@ * mma8451.c - Linux kernel modules for 3-Axis Orientation/Motion * Detection Sensor * - * Copyright (C) 2010 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright (C) 2010-2011 Freescale Semiconductor, Inc. All Rights Reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -45,6 +45,7 @@ #define MMA8451_I2C_ADDR 0x1C #define MMA8451_ID 0x1A +#define POLL_INTERVAL_MAX 500 #define POLL_INTERVAL 100 #define INPUT_FUZZ 32 #define INPUT_FLAT 32 @@ -126,7 +127,6 @@ static struct mma8451_status mma_status = { static struct input_polled_dev *mma8451_idev; static struct device *hwmon_dev; -static int test_test_mode = 1; static struct i2c_client *mma8451_i2c_client; /*************************************************************** @@ -226,11 +226,11 @@ static int __devinit mma8451_probe(struct i2c_client *client, const struct i2c_device_id *id) { int result; - mma8451_i2c_client = client; - struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent); - struct input_dev *idev; + struct i2c_adapter *adapter; + mma8451_i2c_client = client; + adapter = to_i2c_adapter(client->dev.parent); result = i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE | I2C_FUNC_SMBUS_BYTE_DATA); @@ -266,10 +266,10 @@ static int __devinit mma8451_probe(struct i2c_client *client, } mma8451_idev->poll = mma8451_dev_poll; mma8451_idev->poll_interval = POLL_INTERVAL; + mma8451_idev->poll_interval_max = POLL_INTERVAL_MAX; idev = mma8451_idev->input; idev->name = MMA8451_DRV_NAME; idev->id.bustype = BUS_I2C; - idev->dev.parent = &client->dev; idev->evbit[0] = BIT_MASK(EV_ABS); input_set_abs_params(idev, ABS_X, -8192, 8191, INPUT_FUZZ, INPUT_FLAT); |