From patchwork Sun Apr 10 19:06:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alison Schofield X-Patchwork-Id: 8791261 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2DD069F39A for ; Sun, 10 Apr 2016 19:17:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 203F72021A for ; Sun, 10 Apr 2016 19:17:09 +0000 (UTC) Received: from bombadil.infradead.org (unknown [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C788220172 for ; Sun, 10 Apr 2016 19:17:07 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1apKhX-0006o5-TS; Sun, 10 Apr 2016 19:07:15 +0000 Received: from mail-pa0-x241.google.com ([2607:f8b0:400e:c03::241]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1apKhU-0006fb-I5 for linux-arm-kernel@lists.infradead.org; Sun, 10 Apr 2016 19:07:13 +0000 Received: by mail-pa0-x241.google.com with SMTP id k3so9116286pav.3 for ; Sun, 10 Apr 2016 12:06:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=PjpqsHmvOYAwbX94f8e1pfpvfdy2+a57Mh5E+gJ931U=; b=L0hts3n6J/oJ9IB7SGk4r8O8ZCRTgD4hU1FUuEewdBt+0BUksh39btcc37k1JEOmrb CvR1UmfCp3+X1DS02W9yXQbsls2NB32sUbn4SFrXwVS23PfCCO+3oBQbXsTFmbHMU/7Y 39NkrOb8vZgch6Tt/WS38h8Wu8jTOjr8uwDMVrzTqF64uDX08c+YdmkEnknt8KfVr05y KnCFSGVfqWQkF4AMmoB41R3nAQgwJQ3WwGj9ZJlSS3FPZlxSOPvVWXh/6DKG4vFTrouh 6H/6RikBKo66MEK+iTvN9umYUDVXw/fHD7CbUaCilbCAbUzd60pmnmsty2M9TsE1ahnv T+oA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=PjpqsHmvOYAwbX94f8e1pfpvfdy2+a57Mh5E+gJ931U=; b=XfieJEif/YRcpbfcdH99jowiDNIU7FZ92t8si5w+zhk3qjwmGdWefXCuYqCjPDGAPA jpSCY0lXBReGKP5pCplFbQESgAkfhiAQmIrCHivEdzzLqJTstz226EvoKMUMvdalqUJZ H1Iy570jo5/tY4aQZ8UTmV4hk1sxVCcFM7vDhotA9O88FjoxElmVCtdkx39TGLDcOfRi XipnAg0if1oBP5jQZ8fwaX/uWHaH1Q5h9kccdMH6d8HJOeTiXrrL3zDVOvB9AGyG+BkS 6Cu/2mNTfg8/cU8EjDVefY8OesfdLbjUkHPUJSFao+8kxFpT5y3Muin78xcLL6oqPxyD KZog== X-Gm-Message-State: AD7BkJIpzJbw5O6XymTPkkr/B/eJviDh0wrL2q8kHbGVRa25fldehochjh9ITecPOOBDnQ== X-Received: by 10.66.189.166 with SMTP id gj6mr27708651pac.158.1460315211908; Sun, 10 Apr 2016 12:06:51 -0700 (PDT) Received: from localhost.localdomain (or-67-232-74-92.dhcp.embarqhsd.net. [67.232.74.92]) by smtp.gmail.com with ESMTPSA id ta2sm31042800pab.42.2016.04.10.12.06.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 10 Apr 2016 12:06:51 -0700 (PDT) From: Alison Schofield To: jic23@kernel.org Subject: [PATCH v2 2/5] iio: accel: mxc4005: use regmap to retrieve struct device Date: Sun, 10 Apr 2016 12:06:47 -0700 Message-Id: X-Mailer: git-send-email 2.1.4 In-Reply-To: References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160410_120712_671538_6C117554 X-CRM114-Status: GOOD ( 14.66 ) X-Spam-Score: -2.5 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: k.kozlowski@samsung.com, lars@metafoo.de, linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-samsung-soc@vger.kernel.org, kgene@kernel.org, pmeerw@pmeerw.net, knaack.h@gmx.de, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-3.3 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RDNS_NONE, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Driver includes struct regmap and struct device in its global data. Remove the struct device and use regmap API to retrieve device info. Patch created using Coccinelle plus manual edits. Signed-off-by: Alison Schofield --- drivers/iio/accel/mxc4005.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/drivers/iio/accel/mxc4005.c b/drivers/iio/accel/mxc4005.c index c23f47a..013d511 100644 --- a/drivers/iio/accel/mxc4005.c +++ b/drivers/iio/accel/mxc4005.c @@ -60,7 +60,6 @@ enum mxc4005_range { }; struct mxc4005_data { - struct device *dev; struct mutex mutex; struct regmap *regmap; struct iio_trigger *dready_trig; @@ -140,12 +139,13 @@ static const struct regmap_config mxc4005_regmap_config = { static int mxc4005_read_xyz(struct mxc4005_data *data) { + struct device *dev = regmap_get_device(data->regmap); int ret; ret = regmap_bulk_read(data->regmap, MXC4005_REG_XOUT_UPPER, (u8 *) data->buffer, sizeof(data->buffer)); if (ret < 0) { - dev_err(data->dev, "failed to read axes\n"); + dev_err(dev, "failed to read axes\n"); return ret; } @@ -155,12 +155,13 @@ static int mxc4005_read_xyz(struct mxc4005_data *data) static int mxc4005_read_axis(struct mxc4005_data *data, unsigned int addr) { + struct device *dev = regmap_get_device(data->regmap); __be16 reg; int ret; ret = regmap_bulk_read(data->regmap, addr, (u8 *) ®, sizeof(reg)); if (ret < 0) { - dev_err(data->dev, "failed to read reg %02x\n", addr); + dev_err(dev, "failed to read reg %02x\n", addr); return ret; } @@ -169,13 +170,14 @@ static int mxc4005_read_axis(struct mxc4005_data *data, static int mxc4005_read_scale(struct mxc4005_data *data) { + struct device *dev = regmap_get_device(data->regmap); unsigned int reg; int ret; int i; ret = regmap_read(data->regmap, MXC4005_REG_CONTROL, ®); if (ret < 0) { - dev_err(data->dev, "failed to read reg_control\n"); + dev_err(dev, "failed to read reg_control\n"); return ret; } @@ -189,6 +191,7 @@ static int mxc4005_read_scale(struct mxc4005_data *data) static int mxc4005_set_scale(struct mxc4005_data *data, int val) { + struct device *dev = regmap_get_device(data->regmap); unsigned int reg; int i; int ret; @@ -201,8 +204,7 @@ static int mxc4005_set_scale(struct mxc4005_data *data, int val) MXC4005_REG_CONTROL_MASK_FSR, reg); if (ret < 0) - dev_err(data->dev, - "failed to write reg_control\n"); + dev_err(dev, "failed to write reg_control\n"); return ret; } } @@ -321,13 +323,14 @@ err: static int mxc4005_clr_intr(struct mxc4005_data *data) { + struct device *dev = regmap_get_device(data->regmap); int ret; /* clear interrupt */ ret = regmap_write(data->regmap, MXC4005_REG_INT_CLR1, MXC4005_REG_INT_CLR1_BIT_DRDYC); if (ret < 0) { - dev_err(data->dev, "failed to write to reg_int_clr1\n"); + dev_err(dev, "failed to write to reg_int_clr1\n"); return ret; } @@ -339,6 +342,7 @@ static int mxc4005_set_trigger_state(struct iio_trigger *trig, { struct iio_dev *indio_dev = iio_trigger_get_drvdata(trig); struct mxc4005_data *data = iio_priv(indio_dev); + struct device *dev = regmap_get_device(data->regmap); int ret; mutex_lock(&data->mutex); @@ -352,7 +356,7 @@ static int mxc4005_set_trigger_state(struct iio_trigger *trig, if (ret < 0) { mutex_unlock(&data->mutex); - dev_err(data->dev, "failed to update reg_int_mask1"); + dev_err(dev, "failed to update reg_int_mask1"); return ret; } @@ -381,16 +385,17 @@ static const struct iio_trigger_ops mxc4005_trigger_ops = { static int mxc4005_chip_init(struct mxc4005_data *data) { + struct device *dev = regmap_get_device(data->regmap); int ret; unsigned int reg; ret = regmap_read(data->regmap, MXC4005_REG_DEVICE_ID, ®); if (ret < 0) { - dev_err(data->dev, "failed to read chip id\n"); + dev_err(dev, "failed to read chip id\n"); return ret; } - dev_dbg(data->dev, "MXC4005 chip id %02x\n", reg); + dev_dbg(dev, "MXC4005 chip id %02x\n", reg); return 0; } @@ -415,7 +420,6 @@ static int mxc4005_probe(struct i2c_client *client, data = iio_priv(indio_dev); i2c_set_clientdata(client, indio_dev); - data->dev = &client->dev; data->regmap = regmap; ret = mxc4005_chip_init(data);