From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754482AbaDVI4v (ORCPT ); Tue, 22 Apr 2014 04:56:51 -0400 Received: from mailout3.w1.samsung.com ([210.118.77.13]:45448 "EHLO mailout3.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752476AbaDVI4f (ORCPT ); Tue, 22 Apr 2014 04:56:35 -0400 X-AuditID: cbfec7f4-b7fb36d000006ff7-c7-53562ebc0d33 From: Krzysztof Kozlowski To: Sangbeom Kim , Samuel Ortiz , Lee Jones , linux-kernel@vger.kernel.org Cc: Kyungmin Park , Marek Szyprowski , Bartlomiej Zolnierkiewicz , Krzysztof Kozlowski Subject: [PATCH v2 1/2] mfd: sec-core: Remove duplicated device type from sec_pmic_dev Date: Tue, 22 Apr 2014 10:56:09 +0200 Message-id: <1398156970-9360-1-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.9.1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrNJMWRmVeSWpSXmKPExsVy+t/xy7p79MKCDR6ctLDYOGM9q8XrF4YW Z5vesFvc/3qU0eLyrjlsFmuP3GW3ON3NanFxxRcmBw6PO9f2sHnMOxno0bdlFaPH501yASxR XDYpqTmZZalF+nYJXBnnnhsVbBar2PqvmbGBcZVQFyMnh4SAicTCD/9YIWwxiQv31rN1MXJx CAksZZSYffw/lNPHJPH2/jNmkCo2AWOJzcuXgCVEBPoYJc6/XcMI4jALHGWUmN77lgmkSlgg QuLx9fNAVRwcLAKqEp//SoOEeQXcJO7s6oFaJydx8thk1gmM3AsYGVYxiqaWJhcUJ6XnGuoV J+YWl+al6yXn525ihATIlx2Mi49ZHWIU4GBU4uGVMAgNFmJNLCuuzD3EKMHBrCTCy6obFizE m5JYWZValB9fVJqTWnyIkYmDU6qBcbJC0kVBPy5HX/nnZsdMz0vyL1u9TjvcQj/bl2NF4puA jw/j+5j8Z6huawhQyaraE7PjkqKKo9Ux3v7NL0IOfcxVk7/2JLrLPmRqzo1lf2Q/KxQuYXPk cxE5uV03V//Ov/tST3hCLsY/+3e6n5crpGA2d+WlHXtsb95rWytdHHw93OG4vtVGJZbijERD Leai4kQAkoGq/e4BAAA= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The device type was stored in sec_pmic_dev state container twice: - unsigned long type (initialized from of_device_id or i2c_device_id) - int device_type (initialized as above or from board files when there is no DTS) The 'type' field was never used outside of probe so it can be safely removed. Change also the device_type in sec_pmic_dev and sec_platform_data to unsigned long to avoid any casts. Signed-off-by: Krzysztof Kozlowski --- Changes since v1: - Change device_type field of sec_platform_data from int to unsigned long. - Update commit msg. --- drivers/mfd/sec-core.c | 5 +++-- drivers/mfd/sec-irq.c | 2 +- include/linux/mfd/samsung/core.h | 3 +-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/mfd/sec-core.c b/drivers/mfd/sec-core.c index d4682c6cbff5..09fd256abcf6 100644 --- a/drivers/mfd/sec-core.c +++ b/drivers/mfd/sec-core.c @@ -251,6 +251,7 @@ static int sec_pmic_probe(struct i2c_client *i2c, struct sec_platform_data *pdata = dev_get_platdata(&i2c->dev); const struct regmap_config *regmap; struct sec_pmic_dev *sec_pmic; + unsigned long device_type; int ret; sec_pmic = devm_kzalloc(&i2c->dev, sizeof(struct sec_pmic_dev), @@ -262,7 +263,7 @@ static int sec_pmic_probe(struct i2c_client *i2c, sec_pmic->dev = &i2c->dev; sec_pmic->i2c = i2c; sec_pmic->irq = i2c->irq; - sec_pmic->type = sec_i2c_get_driver_data(i2c, id); + device_type = sec_i2c_get_driver_data(i2c, id); if (sec_pmic->dev->of_node) { pdata = sec_pmic_i2c_parse_dt_pdata(sec_pmic->dev); @@ -270,7 +271,7 @@ static int sec_pmic_probe(struct i2c_client *i2c, ret = PTR_ERR(pdata); return ret; } - pdata->device_type = sec_pmic->type; + pdata->device_type = device_type; } if (pdata) { sec_pmic->device_type = pdata->device_type; diff --git a/drivers/mfd/sec-irq.c b/drivers/mfd/sec-irq.c index 64e7913aadc6..654e2c1dbf7a 100644 --- a/drivers/mfd/sec-irq.c +++ b/drivers/mfd/sec-irq.c @@ -385,7 +385,7 @@ int sec_irq_init(struct sec_pmic_dev *sec_pmic) &sec_pmic->irq_data); break; default: - dev_err(sec_pmic->dev, "Unknown device type %d\n", + dev_err(sec_pmic->dev, "Unknown device type %lu\n", sec_pmic->device_type); return -EINVAL; } diff --git a/include/linux/mfd/samsung/core.h b/include/linux/mfd/samsung/core.h index 84aaf6c25794..e7e12ebacb9b 100644 --- a/include/linux/mfd/samsung/core.h +++ b/include/linux/mfd/samsung/core.h @@ -43,13 +43,12 @@ struct sec_pmic_dev { struct regmap *regmap_pmic; struct i2c_client *i2c; - int device_type; + unsigned long device_type; int irq_base; int irq; struct regmap_irq_chip_data *irq_data; int ono; - unsigned long type; bool wakeup; bool wtsr_smpl; }; -- 1.9.1