From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753188AbcLHUSH (ORCPT ); Thu, 8 Dec 2016 15:18:07 -0500 Received: from mail-pf0-f181.google.com ([209.85.192.181]:36600 "EHLO mail-pf0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752255AbcLHUSF (ORCPT ); Thu, 8 Dec 2016 15:18:05 -0500 From: Jingkui Wang To: linux-input@vger.kernel.org Cc: dmitry.torokhov@gmail.com, Dan Murphy , Jingkui Wang , linux-kernel@vger.kernel.org Subject: [PATCH] drivers: Update drv260x driver Date: Thu, 8 Dec 2016 12:17:59 -0800 Message-Id: <1481228279-58030-1-git-send-email-jkwang@google.com> X-Mailer: git-send-email 2.6.6 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Update driver drv260x to use generic device properties Remove platform data Signed-off-by: Jingkui Wang --- drivers/input/misc/drv260x.c | 43 ++++++++----------------------------------- 1 file changed, 8 insertions(+), 35 deletions(-) diff --git a/drivers/input/misc/drv260x.c b/drivers/input/misc/drv260x.c index 2adfd86c..4f448ba 100644 --- a/drivers/input/misc/drv260x.c +++ b/drivers/input/misc/drv260x.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include #include @@ -27,7 +26,6 @@ #include #include -#include #define DRV260X_STATUS 0x0 #define DRV260X_MODE 0x1 @@ -468,52 +466,39 @@ static const struct regmap_config drv260x_regmap_config = { .cache_type = REGCACHE_NONE, }; -#ifdef CONFIG_OF -static int drv260x_parse_dt(struct device *dev, +static int drv260x_read_device_property(struct device *dev, struct drv260x_data *haptics) { - struct device_node *np = dev->of_node; unsigned int voltage; int error; - error = of_property_read_u32(np, "mode", &haptics->mode); + error = device_property_read_u32(dev, "mode", &haptics->mode); if (error) { dev_err(dev, "%s: No entry for mode\n", __func__); return error; } - error = of_property_read_u32(np, "library-sel", &haptics->library); + error = device_property_read_u32(dev, "library-sel", &haptics->library); if (error) { dev_err(dev, "%s: No entry for library selection\n", __func__); return error; } - error = of_property_read_u32(np, "vib-rated-mv", &voltage); + error = device_property_read_u32(dev, "vib-rated-mv", &voltage); if (!error) haptics->rated_voltage = drv260x_calculate_voltage(voltage); - - error = of_property_read_u32(np, "vib-overdrive-mv", &voltage); + error = device_property_read_u32(dev, "vib-overdrive-mv", &voltage); if (!error) haptics->overdrive_voltage = drv260x_calculate_voltage(voltage); return 0; } -#else -static inline int drv260x_parse_dt(struct device *dev, - struct drv260x_data *haptics) -{ - dev_err(dev, "no platform data defined\n"); - - return -EINVAL; -} -#endif static int drv260x_probe(struct i2c_client *client, const struct i2c_device_id *id) { - const struct drv260x_platform_data *pdata = dev_get_platdata(&client->dev); struct drv260x_data *haptics; int error; @@ -524,21 +509,9 @@ static int drv260x_probe(struct i2c_client *client, haptics->rated_voltage = DRV260X_DEF_OD_CLAMP_VOLT; haptics->rated_voltage = DRV260X_DEF_RATED_VOLT; - if (pdata) { - haptics->mode = pdata->mode; - haptics->library = pdata->library_selection; - if (pdata->vib_overdrive_voltage) - haptics->overdrive_voltage = drv260x_calculate_voltage(pdata->vib_overdrive_voltage); - if (pdata->vib_rated_voltage) - haptics->rated_voltage = drv260x_calculate_voltage(pdata->vib_rated_voltage); - } else if (client->dev.of_node) { - error = drv260x_parse_dt(&client->dev, haptics); - if (error) - return error; - } else { - dev_err(&client->dev, "Platform data not set\n"); - return -ENODEV; - } + error = drv260x_read_device_property(&client->dev, haptics); + if (error) + return error; if (haptics->mode < DRV260X_LRA_MODE || -- 2.6.6