From patchwork Fri May 24 10:39:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Baltieri X-Patchwork-Id: 17193 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f198.google.com (mail-lb0-f198.google.com [209.85.217.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2B328238FC for ; Fri, 24 May 2013 10:40:39 +0000 (UTC) Received: by mail-lb0-f198.google.com with SMTP id t10sf3243319lbi.1 for ; Fri, 24 May 2013 03:39:40 -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=qKeToXZf+C5IHhyOIfrUDt0AhzlybEQPvhnLtntzrRs=; b=Asd8VENk9kJCq/F2PS0pNne07AutVCuQwpLYomWdrw82JGq8CJDSMNwjWUcwN5TSvo 28dRU/fTKTNeXuLOU2PiriA6XXLiS+uYdO9NWXcmEQ9UEmwZDjEVxUja/JWn/OrDtzB0 brLGGSz3giD6JLZkj+nqhgplpRoP2nyit4qSPbof00260T52DJcR1whhtGK8l0G5XM3P 5YkLUe/wPsZf3sfMmo5/aqmGdqzbNJCLtyRbyznzCzmcaiH1CX/wxEjQO1Xk0kRX5W6X hktZDEf+v1nKFsjSMNlPcoBTKj9UeT8yZZiR02NeCme99gv07EfTEmu2JwytFwJ+0WXi EXaA== X-Received: by 10.180.160.212 with SMTP id xm20mr7424910wib.0.1369391980481; Fri, 24 May 2013 03:39:40 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.180.87.36 with SMTP id u4ls192762wiz.19.gmail; Fri, 24 May 2013 03:39:40 -0700 (PDT) X-Received: by 10.180.184.2 with SMTP id eq2mr753374wic.50.1369391980379; Fri, 24 May 2013 03:39:40 -0700 (PDT) Received: from mail-ve0-x235.google.com (mail-ve0-x235.google.com [2607:f8b0:400c:c01::235]) by mx.google.com with ESMTPS id hj2si17684249wib.22.2013.05.24.03.39.40 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 24 May 2013 03:39:40 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c01::235 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c01::235; Received: by mail-ve0-f181.google.com with SMTP id db10so1447682veb.40 for ; Fri, 24 May 2013 03:39:39 -0700 (PDT) X-Received: by 10.220.112.16 with SMTP id u16mr8122499vcp.40.1369391979287; Fri, 24 May 2013 03:39:39 -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 c10csp94534vcs; Fri, 24 May 2013 03:39:38 -0700 (PDT) X-Received: by 10.180.210.137 with SMTP id mu9mr809887wic.38.1369391978105; Fri, 24 May 2013 03:39:38 -0700 (PDT) Received: from mail-ee0-f43.google.com (mail-ee0-f43.google.com [74.125.83.43]) by mx.google.com with ESMTPS id f5si21176254eep.30.2013.05.24.03.39.37 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 24 May 2013 03:39:38 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.83.43 is neither permitted nor denied by best guess record for domain of fabio.baltieri@linaro.org) client-ip=74.125.83.43; Received: by mail-ee0-f43.google.com with SMTP id d41so2580074eek.16 for ; Fri, 24 May 2013 03:39:37 -0700 (PDT) X-Received: by 10.15.43.71 with SMTP id w47mr40864814eev.32.1369391977624; Fri, 24 May 2013 03:39:37 -0700 (PDT) Received: from localhost (2-224-81-44.ip169.fastwebnet.it. [2.224.81.44]) by mx.google.com with ESMTPSA id w43sm22757263eeg.14.2013.05.24.03.39.35 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 24 May 2013 03:39:36 -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 4/6] ASoC: ux500: Drop unused code from msp headers Date: Fri, 24 May 2013 12:39:18 +0200 Message-Id: <1369391960-27320-5-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: ALoCoQk9BRX31jf3ncOt8cyKzVCxZrFR72ILpGrMdclhDDsUvyDNqW/31FJYZMKkud1ZrDWkoIJg X-Original-Sender: fabio.baltieri@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c01::235 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 unused fields and structures from ux500_msp_i2s header file, as those looks like leftover from a previous implementation of the driver. Signed-off-by: Fabio Baltieri --- sound/soc/ux500/ux500_msp_dai.h | 2 -- sound/soc/ux500/ux500_msp_i2s.h | 31 ------------------------------- 2 files changed, 33 deletions(-) diff --git a/sound/soc/ux500/ux500_msp_dai.h b/sound/soc/ux500/ux500_msp_dai.h index f531043..c721282 100644 --- a/sound/soc/ux500/ux500_msp_dai.h +++ b/sound/soc/ux500/ux500_msp_dai.h @@ -58,8 +58,6 @@ struct ux500_msp_i2s_drvdata { unsigned int rx_mask; int slots; int slot_width; - u8 configured; - int data_delay; /* Clocks */ unsigned int master_clk; diff --git a/sound/soc/ux500/ux500_msp_i2s.h b/sound/soc/ux500/ux500_msp_i2s.h index ccfcc32..d5e4176 100644 --- a/sound/soc/ux500/ux500_msp_i2s.h +++ b/sound/soc/ux500/ux500_msp_i2s.h @@ -341,11 +341,6 @@ enum msp_compress_mode { MSP_COMPRESS_MODE_A_LAW = 3 }; -enum msp_spi_burst_mode { - MSP_SPI_BURST_MODE_DISABLE = 0, - MSP_SPI_BURST_MODE_ENABLE = 1 -}; - enum msp_expand_mode { MSP_EXPAND_MODE_LINEAR = 0, MSP_EXPAND_MODE_LINEAR_SIGNED = 1, @@ -454,21 +449,6 @@ struct msp_protdesc { u32 clocks_per_frame; }; -struct i2s_message { - enum i2s_direction_t i2s_direction; - void *txdata; - void *rxdata; - size_t txbytes; - size_t rxbytes; - int dma_flag; - int tx_offset; - int rx_offset; - bool cyclic_dma; - dma_addr_t buf_addr; - size_t buf_len; - size_t period_len; -}; - struct ux500_msp_config { unsigned int f_inputclk; unsigned int rx_clk_sel; @@ -480,8 +460,6 @@ struct ux500_msp_config { unsigned int tx_fsync_sel; unsigned int rx_fifo_config; unsigned int tx_fifo_config; - unsigned int spi_clk_mode; - unsigned int spi_burst_mode; unsigned int loopback_enable; unsigned int tx_data_enable; unsigned int default_protdesc; @@ -491,13 +469,9 @@ struct ux500_msp_config { unsigned int direction; unsigned int protocol; unsigned int frame_freq; - unsigned int frame_size; enum msp_data_size data_size; unsigned int def_elem_len; unsigned int iodelay; - void (*handler) (void *data); - void *tx_callback_data; - void *rx_callback_data; }; struct ux500_msp { @@ -506,15 +480,10 @@ struct ux500_msp { struct device *dev; struct stedma40_chan_cfg *dma_cfg_rx; struct stedma40_chan_cfg *dma_cfg_tx; - struct dma_chan *tx_pipeid; - struct dma_chan *rx_pipeid; enum msp_state msp_state; - int (*transfer) (struct ux500_msp *msp, struct i2s_message *message); - struct timer_list notify_timer; int def_elem_len; unsigned int dir_busy; int loopback_enable; - u32 backup_regs[MAX_MSP_BACKUP_REGS]; unsigned int f_bitclk; };