From patchwork Fri May 24 10:39:17 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Baltieri X-Patchwork-Id: 17192 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ye0-f197.google.com (mail-ye0-f197.google.com [209.85.213.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 05252238FC for ; Fri, 24 May 2013 10:40:34 +0000 (UTC) Received: by mail-ye0-f197.google.com with SMTP id q4sf864021yen.8 for ; Fri, 24 May 2013 03:39:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-beenthere:x-forwarded-to:x-forwarded-for :delivered-to:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=3QaBsZb6Uu5rh7dBs7/oYPhoWbBNXBbtbdyC9Y5bORI=; b=TZhdgpUrwMnwuwkSds1tiRG8ee4mAe18xXYyJIa3gJIOp57mUo1aSgnFuKt3WPInJz xahwd/VlfhlT2zsrBEiAMCcQoXF+NIlmNHxFamCBaQRWY5hYeSBeK0wD84+GMoiNl4NP 1cKrN41S/+dz/IoLMkYmD9SgkOWz2HcED1i/M469PV/oIHJRWtrRCUBjZRxTFDXAtl47 7oWqzEqi3/U5yEmfWvJGfUUlr7BzFdDIiC1LiQBbapbm/E0Orxp+H0a0kZB+xYkZYTQH bH61FlMEZFekuPkkxSHXkSBA1J+gojvynRhYA6PZGacrLZRC4kCNFZqIdaZqyyC6EHnV GFsw== X-Received: by 10.224.205.138 with SMTP id fq10mr2189236qab.1.1369391976874; Fri, 24 May 2013 03:39:36 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.76.65 with SMTP id i1ls567218qew.2.gmail; Fri, 24 May 2013 03:39:36 -0700 (PDT) X-Received: by 10.58.188.82 with SMTP id fy18mr8050254vec.41.1369391976064; Fri, 24 May 2013 03:39:36 -0700 (PDT) Received: from mail-vc0-f174.google.com (mail-vc0-f174.google.com [209.85.220.174]) by mx.google.com with ESMTPS id om10si9067923vec.13.2013.05.24.03.39.36 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 24 May 2013 03:39:36 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.174 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.174; Received: by mail-vc0-f174.google.com with SMTP id hr11so2968163vcb.5 for ; Fri, 24 May 2013 03:39:36 -0700 (PDT) X-Received: by 10.58.187.164 with SMTP id ft4mr7944635vec.5.1369391975916; Fri, 24 May 2013 03:39:35 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.126.138 with SMTP id c10csp94531vcs; Fri, 24 May 2013 03:39:35 -0700 (PDT) X-Received: by 10.15.35.71 with SMTP id f47mr42184791eev.15.1369391974997; Fri, 24 May 2013 03:39:34 -0700 (PDT) Received: from mail-ee0-f54.google.com (mail-ee0-f54.google.com [74.125.83.54]) by mx.google.com with ESMTPS id t45si21076168eel.254.2013.05.24.03.39.34 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 24 May 2013 03:39:34 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.83.54 is neither permitted nor denied by best guess record for domain of fabio.baltieri@linaro.org) client-ip=74.125.83.54; Received: by mail-ee0-f54.google.com with SMTP id e50so2507860eek.41 for ; Fri, 24 May 2013 03:39:34 -0700 (PDT) X-Received: by 10.15.55.132 with SMTP id v4mr41555196eew.19.1369391974496; Fri, 24 May 2013 03:39:34 -0700 (PDT) Received: from localhost (2-224-81-44.ip169.fastwebnet.it. [2.224.81.44]) by mx.google.com with ESMTPSA id g7sm22773736eew.15.2013.05.24.03.39.32 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 24 May 2013 03:39:33 -0700 (PDT) From: Fabio Baltieri To: Mark Brown Cc: Liam Girdwood , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Linus Walleij , Lee Jones , Ola Lilja , Fabio Baltieri Subject: [PATCH 3/6] ASoC: ux500: Drop dangling struct i2s_controller Date: Fri, 24 May 2013 12:39:17 +0200 Message-Id: <1369391960-27320-4-git-send-email-fabio.baltieri@linaro.org> X-Mailer: git-send-email 1.8.2 In-Reply-To: <1369391960-27320-1-git-send-email-fabio.baltieri@linaro.org> References: <1369391960-27320-1-git-send-email-fabio.baltieri@linaro.org> X-Gm-Message-State: ALoCoQnhRNYjV3/D/KnEpMBSd8I6cc0k3Y80jscL8Vh/gxiMcco6Y1e3M5PE60RmirAEIAhtLC4w X-Original-Sender: fabio.baltieri@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.174 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Drop struct i2s_controller from the ux500 ASoC driver as right now it is instantiated but not used anywhere. Also drop a mismatched device_unregister in the process. Signed-off-by: Fabio Baltieri --- sound/soc/ux500/ux500_msp_i2s.c | 19 ------------------- sound/soc/ux500/ux500_msp_i2s.h | 12 ------------ 2 files changed, 31 deletions(-) diff --git a/sound/soc/ux500/ux500_msp_i2s.c b/sound/soc/ux500/ux500_msp_i2s.c index b029b2d..cba0e86 100644 --- a/sound/soc/ux500/ux500_msp_i2s.c +++ b/sound/soc/ux500/ux500_msp_i2s.c @@ -649,7 +649,6 @@ int ux500_msp_i2s_init_msp(struct platform_device *pdev, struct msp_i2s_platform_data *platform_data) { struct resource *res = NULL; - struct i2s_controller *i2s_cont; struct device_node *np = pdev->dev.of_node; struct ux500_msp *msp; @@ -694,22 +693,6 @@ int ux500_msp_i2s_init_msp(struct platform_device *pdev, msp->msp_state = MSP_STATE_IDLE; msp->loopback_enable = 0; - /* I2S-controller is allocated and added in I2S controller class. */ - i2s_cont = devm_kzalloc(&pdev->dev, sizeof(*i2s_cont), GFP_KERNEL); - if (!i2s_cont) { - dev_err(&pdev->dev, - "%s: ERROR: Failed to allocate I2S-controller!\n", - __func__); - return -ENOMEM; - } - i2s_cont->dev.parent = &pdev->dev; - i2s_cont->data = (void *)msp; - i2s_cont->id = (s16)msp->id; - snprintf(i2s_cont->name, sizeof(i2s_cont->name), "ux500-msp-i2s.%04x", - msp->id); - dev_dbg(&pdev->dev, "I2S device-name: '%s'\n", i2s_cont->name); - msp->i2s_cont = i2s_cont; - return 0; } @@ -717,8 +700,6 @@ void ux500_msp_i2s_cleanup_msp(struct platform_device *pdev, struct ux500_msp *msp) { dev_dbg(msp->dev, "%s: Enter (id = %d).\n", __func__, msp->id); - - device_unregister(&msp->i2s_cont->dev); } MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/ux500/ux500_msp_i2s.h b/sound/soc/ux500/ux500_msp_i2s.h index 8ce014e..ccfcc32 100644 --- a/sound/soc/ux500/ux500_msp_i2s.h +++ b/sound/soc/ux500/ux500_msp_i2s.h @@ -469,17 +469,6 @@ struct i2s_message { size_t period_len; }; -struct i2s_controller { - struct module *owner; - unsigned int id; - unsigned int class; - const struct i2s_algorithm *algo; /* the algorithm to access the bus */ - void *data; - struct mutex bus_lock; - struct device dev; /* the controller device */ - char name[48]; -}; - struct ux500_msp_config { unsigned int f_inputclk; unsigned int rx_clk_sel; @@ -515,7 +504,6 @@ struct ux500_msp { enum enum_i2s_controller id; void __iomem *registers; struct device *dev; - struct i2s_controller *i2s_cont; struct stedma40_chan_cfg *dma_cfg_rx; struct stedma40_chan_cfg *dma_cfg_tx; struct dma_chan *tx_pipeid;