From patchwork Wed Sep 29 16:23:44 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= X-Patchwork-Id: 66074 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-wy0-f184.google.com (mail-wy0-f184.google.com [74.125.82.184]) by ozlabs.org (Postfix) with ESMTP id 9EDA0B6F11 for ; Thu, 30 Sep 2010 02:32:07 +1000 (EST) Received: by wyi11 with SMTP id 11sf494469wyi.11 for ; Wed, 29 Sep 2010 09:32:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=beta; h=domainkey-signature:received:x-beenthere:received:received:received :received:received-spf:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references:mime-version :x-sa-exim-connect-ip:x-sa-exim-mail-from:x-sa-exim-scanned :x-ptx-original-recipient:x-original-sender :x-original-authentication-results:reply-to:precedence:mailing-list :list-id:list-post:list-help:list-archive:sender:list-subscribe :list-unsubscribe:content-type:content-transfer-encoding; bh=XD4EAOQ8hmbIJl5Uegm19dZ5aSQpuLuWA2xCJBEIAEc=; b=1v3tKw3XSnF04B6hAT/JJldzsyhkVpAtZw1KGVCw/L2SpK0i2wJ9EHQnKw5i4C2ElS 66ibVEN55sAdUD92zOgEd/kVaPTw2Qksyu/RZDXZMakMXbKhMVDdlkOOaKsFVh7XzUhT xMKfsyC2Glj/MuIKvB6ZwHY6+nClZ5tQ7+XgA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlegroups.com; s=beta; h=x-beenthere:received-spf:from:to:cc:subject:date:message-id :x-mailer:in-reply-to:references:mime-version:x-sa-exim-connect-ip :x-sa-exim-mail-from:x-sa-exim-scanned:x-ptx-original-recipient :x-original-sender:x-original-authentication-results:reply-to :precedence:mailing-list:list-id:list-post:list-help:list-archive :sender:list-subscribe:list-unsubscribe:content-type :content-transfer-encoding; b=0u0VS9fROubNZ2rJZZIBn9TWXAtT+RWYups4SRbIuS5X6Udrj5xj/f5iqtdq4i9kuu 2IqxzDBA+oBiByJsGmEQkaBmJZ51JKhIgLRuf30qjdarcFi40yB7dxGXe3KEl7Vn9u3M OP0Bipaapu7aP/cT3883YYQg/fkv0fbhnCJEE= Received: by 10.216.145.130 with SMTP id p2mr483500wej.22.1285777437854; Wed, 29 Sep 2010 09:23:57 -0700 (PDT) X-BeenThere: rtc-linux@googlegroups.com Received: by 10.14.46.205 with SMTP id r53ls66676eeb.7.p; Wed, 29 Sep 2010 09:23:57 -0700 (PDT) Received: by 10.14.29.66 with SMTP id h42mr130133eea.10.1285777436885; Wed, 29 Sep 2010 09:23:56 -0700 (PDT) Received: by 10.14.29.66 with SMTP id h42mr130132eea.10.1285777436858; Wed, 29 Sep 2010 09:23:56 -0700 (PDT) Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [92.198.50.35]) by gmr-mx.google.com with ESMTP id b5si9040905eei.4.2010.09.29.09.23.56; Wed, 29 Sep 2010 09:23:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of ukl@pengutronix.de designates 92.198.50.35 as permitted sender) client-ip=92.198.50.35; Received: from octopus.hi.pengutronix.de ([2001:6f8:1178:2:215:17ff:fe12:23b0]) by metis.ext.pengutronix.de with esmtp (Exim 4.71) (envelope-from ) id 1P0zRi-000482-QS; Wed, 29 Sep 2010 18:23:54 +0200 Received: from ukl by octopus.hi.pengutronix.de with local (Exim 4.69) (envelope-from ) id 1P0zRi-0000lM-Mo; Wed, 29 Sep 2010 18:23:54 +0200 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: linux-kernel@vger.kernel.org, Samuel Ortiz , Alessandro Zummo , rtc-linux@googlegroups.com Cc: Andrew Morton , Richard Purdie , Alberto Panizzo , Valentin Longchamp Subject: [rtc-linux] [PATCH 1/4] mfd/mc13783: remove obsolete private data Date: Wed, 29 Sep 2010 18:23:44 +0200 Message-Id: <1285777427-2887-1-git-send-email-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <20100929162315.GG29811@pengutronix.de> References: <20100929162315.GG29811@pengutronix.de> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:6f8:1178:2:215:17ff:fe12:23b0 X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: rtc-linux@googlegroups.com X-Original-Sender: u.kleine-koenig@pengutronix.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: best guess record for domain of ukl@pengutronix.de designates 92.198.50.35 as permitted sender) smtp.mail=ukl@pengutronix.de Reply-To: rtc-linux@googlegroups.com Precedence: list Mailing-list: list rtc-linux@googlegroups.com; contact rtc-linux+owners@googlegroups.com List-ID: List-Post: , List-Help: , List-Archive: Sender: rtc-linux@googlegroups.com List-Subscribe: , List-Unsubscribe: , The regulator driver was converted to get the needed data directly from platform_data by a10099b (regulator/mc13783: various cleanups) so regulators and num_regulators can go away. Then apart from the flag indicating that the adc does a conversion, flags is only a copy of the flags member of platform_data. This flag isn't needed to be returned by mc13783_get_flags, so mc13783_get_flags now gets the flags from platform_data, too and the driver private member is renamed for clearity. Signed-off-by: Uwe Kleine-König --- drivers/mfd/mc13783-core.c | 27 +++++++++------------------ 1 files changed, 9 insertions(+), 18 deletions(-) diff --git a/drivers/mfd/mc13783-core.c b/drivers/mfd/mc13783-core.c index 6df3498..2506e68 100644 --- a/drivers/mfd/mc13783-core.c +++ b/drivers/mfd/mc13783-core.c @@ -22,14 +22,10 @@ struct mc13783 { struct spi_device *spidev; struct mutex lock; int irq; - int flags; + int adcflags; irq_handler_t irqhandler[MC13783_NUM_IRQ]; void *irqdata[MC13783_NUM_IRQ]; - - /* XXX these should go as platformdata to the regulator subdevice */ - struct mc13783_regulator_init_data *regulators; - int num_regulators; }; #define MC13783_REG_REVISION 7 @@ -250,7 +246,10 @@ EXPORT_SYMBOL(mc13783_reg_rmw); int mc13783_get_flags(struct mc13783 *mc13783) { - return mc13783->flags; + struct mc13783_platform_data *pdata = + dev_get_platdata(&mc13783->spidev->dev); + + return pdata->flags; } EXPORT_SYMBOL(mc13783_get_flags); @@ -493,7 +492,7 @@ static irqreturn_t mc13783_handler_adcdone(int irq, void *data) return IRQ_HANDLED; } -#define MC13783_ADC_WORKING (1 << 16) +#define MC13783_ADC_WORKING (1 << 0) int mc13783_adc_do_conversion(struct mc13783 *mc13783, unsigned int mode, unsigned int channel, unsigned int *sample) @@ -509,12 +508,12 @@ int mc13783_adc_do_conversion(struct mc13783 *mc13783, unsigned int mode, mc13783_lock(mc13783); - if (mc13783->flags & MC13783_ADC_WORKING) { + if (mc13783->adcflags & MC13783_ADC_WORKING) { ret = -EBUSY; goto out; } - mc13783->flags |= MC13783_ADC_WORKING; + mc13783->adcflags |= MC13783_ADC_WORKING; mc13783_reg_read(mc13783, MC13783_ADC0, &old_adc0); @@ -578,7 +577,7 @@ int mc13783_adc_do_conversion(struct mc13783 *mc13783, unsigned int mode, /* restore TSMOD */ mc13783_reg_write(mc13783, MC13783_REG_ADC_0, old_adc0); - mc13783->flags &= ~MC13783_ADC_WORKING; + mc13783->adcflags &= ~MC13783_ADC_WORKING; out: mc13783_unlock(mc13783); @@ -675,14 +674,6 @@ err_revision: return ret; } - /* This should go away (BEGIN) */ - if (pdata) { - mc13783->flags = pdata->flags; - mc13783->regulators = pdata->regulators; - mc13783->num_regulators = pdata->num_regulators; - } - /* This should go away (END) */ - mc13783_unlock(mc13783); if (pdata->flags & MC13783_USE_ADC)