From patchwork Sun Jul 19 01:15:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Axel Lin X-Patchwork-Id: 6821511 Return-Path: X-Original-To: patchwork-alsa-devel@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 7CCFA9F38B for ; Sun, 19 Jul 2015 01:16:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9CBA72060E for ; Sun, 19 Jul 2015 01:16:03 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 5DA9820607 for ; Sun, 19 Jul 2015 01:16:02 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 73FBF260522; Sun, 19 Jul 2015 03:16:01 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 4764F260506; Sun, 19 Jul 2015 03:15:53 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 20D99260508; Sun, 19 Jul 2015 03:15:52 +0200 (CEST) Received: from mail-pd0-f177.google.com (mail-pd0-f177.google.com [209.85.192.177]) by alsa0.perex.cz (Postfix) with ESMTP id C85F5260506 for ; Sun, 19 Jul 2015 03:15:44 +0200 (CEST) Received: by pdbbh15 with SMTP id bh15so36484414pdb.1 for ; Sat, 18 Jul 2015 18:15:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:subject:from:to:cc:date:in-reply-to :references:content-type:mime-version:content-transfer-encoding; bh=dcZYhC9ggTQnPV0fGpDGyH2PypXIRXSCnu+jjLeQ3q8=; b=Sf4x4nTxoQnGqJlLEMV7LzQ7iOPG3dbdJCp4+ocSZ9LqyvdhHvjuOyII4BzUsVCUAb cSqK1R3zAliP0gr4u0zewS7606eaS8stivkLSUsA/+MD6izRKIC0+h+9ffXk7wwyRL9n jcj2UM1oId85lZp36LlNegpNKIJLof4qYafIw0lEB+yakh+PIxyjq2TMUUwdjGi/Kz7G 0aC84tYdJtRiJw/JYJiEid+x+lYJOyKH5KvNMPb8L7kF40ThJ30ajhPt5Pj3KTSJL5Ns u5UUV9Q01wIDDxUojz7QlDYPjw6mbxyCUfPu0rbJLNhIgCf7DsQn1yTND3FxvueRpmB/ uuAQ== X-Gm-Message-State: ALoCoQlHq0dpWFyOAP25Fkn+olmH1IhtcaX0GchXK027MV+X59tncgAJI9FtvkFgvE7LtYb9am+b X-Received: by 10.66.227.131 with SMTP id sa3mr43536021pac.24.1437268543662; Sat, 18 Jul 2015 18:15:43 -0700 (PDT) Received: from phoenix.local (118-171-143-53.dynamic.hinet.net. [118.171.143.53]) by smtp.gmail.com with ESMTPSA id no6sm15496432pdb.42.2015.07.18.18.15.40 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 18 Jul 2015 18:15:42 -0700 (PDT) Message-ID: <1437268538.11309.3.camel@ingics.com> From: Axel Lin To: Mark Brown Date: Sun, 19 Jul 2015 09:15:38 +0800 In-Reply-To: <1437268463.11309.1.camel@ingics.com> References: <1437268463.11309.1.camel@ingics.com> X-Mailer: Evolution 3.12.10-0ubuntu1~14.10.1 Mime-Version: 1.0 Cc: Brian Austin , alsa-devel@alsa-project.org, Liam Girdwood , Paul Handrigan , Tim Howe Subject: [alsa-devel] [PATCH 2/2] ASoC: cs4349: Drop platform data support X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP The struct cs4349_platform_data should be defined in a public header in include/sound/ rather than in sound/soc/codecs folder. In additional, the platform data support is not properly handled in this driver so remove it now. Signed-off-by: Axel Lin --- sound/soc/codecs/cs4349.c | 7 +------ sound/soc/codecs/cs4349.h | 7 ------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/sound/soc/codecs/cs4349.c b/sound/soc/codecs/cs4349.c index eb55889..7befc05 100644 --- a/sound/soc/codecs/cs4349.c +++ b/sound/soc/codecs/cs4349.c @@ -45,7 +45,6 @@ static const struct reg_default cs4349_reg_defaults[] = { /* Private data for the CS4349 */ struct cs4349_private { struct regmap *regmap; - struct cs4349_platform_data pdata; struct gpio_desc *reset_gpio; unsigned int mode; int rate; @@ -283,8 +282,7 @@ static int cs4349_i2c_probe(struct i2c_client *client, const struct i2c_device_id *id) { struct cs4349_private *cs4349; - struct cs4349_platform_data *pdata = dev_get_platdata(&client->dev); - int ret = 0; + int ret; cs4349 = devm_kzalloc(&client->dev, sizeof(*cs4349), GFP_KERNEL); if (!cs4349) @@ -297,9 +295,6 @@ static int cs4349_i2c_probe(struct i2c_client *client, return ret; } - if (pdata) - cs4349->pdata = *pdata; - /* Reset the Device */ cs4349->reset_gpio = devm_gpiod_get_optional(&client->dev, "reset", GPIOD_OUT_LOW); diff --git a/sound/soc/codecs/cs4349.h b/sound/soc/codecs/cs4349.h index 7effa0a..d58c06a 100644 --- a/sound/soc/codecs/cs4349.h +++ b/sound/soc/codecs/cs4349.h @@ -19,13 +19,6 @@ #ifndef __CS4349_H__ #define __CS4349_H__ -struct cs4349_platform_data { - - /* GPIO for Reset */ - unsigned int gpio_nreset; - -}; - /* CS4349 registers addresses */ #define CS4349_CHIPID 0x01 /* Device and Rev ID, Read Only */ #define CS4349_MODE 0x02 /* Mode Control */