From patchwork Fri May 24 10:39:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Baltieri X-Patchwork-Id: 17195 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f199.google.com (mail-vc0-f199.google.com [209.85.220.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id AB441238FC for ; Fri, 24 May 2013 10:40:42 +0000 (UTC) Received: by mail-vc0-f199.google.com with SMTP id hf12sf5439001vcb.10 for ; Fri, 24 May 2013 03:39:45 -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=xWDYkjDkVzW43Rw3QUCVBs33Dy8hyanKOqCr+zNXdUU=; b=mvpn9kll1jh14Odccqwk6X2lCbRoV1BsFAkRZz3xZrnwpn2+Q67BuKP4mrbfXjASqN fb3FP+lRJEdM5vyr1BlbGNp33E9EBpvdSyOzz+l+9GU0ewr4SsLxx20zyPZoHjgk4f8l HLWyOzeqBlfDluyhzcFi1YzVEFSA2Lv+YKgHJh3k2M8rCRXW4e4+mGlfx/C5MvkHhDTr WPR0+nkhYkRRNljZKuHKmvFjEHKFRZhVrZedU6NbOhn9wx2V7b/l9R+CbwdDssJy8oCT f81JAdqm4BPfCpE//8SJDeF6yG2GKPP9yGcSVLGQumbBNkpz/+ZKzCAsp9YbjJLPWrEd YGFQ== X-Received: by 10.224.205.138 with SMTP id fq10mr2189584qab.1.1369391985352; Fri, 24 May 2013 03:39:45 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.42.106 with SMTP id n10ls1780860qel.90.gmail; Fri, 24 May 2013 03:39:45 -0700 (PDT) X-Received: by 10.52.233.34 with SMTP id tt2mr6764080vdc.70.1369391985193; Fri, 24 May 2013 03:39:45 -0700 (PDT) Received: from mail-vc0-f178.google.com (mail-vc0-f178.google.com [209.85.220.178]) by mx.google.com with ESMTPS id iz8si9038745vdb.149.2013.05.24.03.39.45 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 24 May 2013 03:39:45 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.178 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.178; Received: by mail-vc0-f178.google.com with SMTP id id13so2962475vcb.23 for ; Fri, 24 May 2013 03:39:45 -0700 (PDT) X-Received: by 10.58.250.66 with SMTP id za2mr7963582vec.56.1369391985068; Fri, 24 May 2013 03:39:45 -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 c10csp94538vcs; Fri, 24 May 2013 03:39:44 -0700 (PDT) X-Received: by 10.15.26.6 with SMTP id m6mr42046020eeu.4.1369391984172; Fri, 24 May 2013 03:39:44 -0700 (PDT) Received: from mail-ee0-f50.google.com (mail-ee0-f50.google.com [74.125.83.50]) by mx.google.com with ESMTPS id 44si21179882eeo.20.2013.05.24.03.39.43 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 24 May 2013 03:39:44 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.83.50 is neither permitted nor denied by best guess record for domain of fabio.baltieri@linaro.org) client-ip=74.125.83.50; Received: by mail-ee0-f50.google.com with SMTP id c41so2506134eek.23 for ; Fri, 24 May 2013 03:39:43 -0700 (PDT) X-Received: by 10.14.99.198 with SMTP id x46mr41945600eef.38.1369391983684; Fri, 24 May 2013 03:39:43 -0700 (PDT) Received: from localhost (2-224-81-44.ip169.fastwebnet.it. [2.224.81.44]) by mx.google.com with ESMTPSA id g7sm22774660eew.15.2013.05.24.03.39.41 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 24 May 2013 03:39:42 -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 6/6] ASoC: ux500: Drop redundant msp id enumerations Date: Fri, 24 May 2013 12:39:20 +0200 Message-Id: <1369391960-27320-7-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: ALoCoQns8+7dARUqMagfQVJKWtIawtT67ZuJ3yHAOckvtVn12GaGFGfT+ayFep9Yk8yi4TYc25ra X-Original-Sender: fabio.baltieri@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.178 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: , Ux500 has two equivalent enum for device id, one in platform_data and one in a local header. Fix this by dropping the local one. Signed-off-by: Fabio Baltieri --- sound/soc/ux500/ux500_msp_i2s.h | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/sound/soc/ux500/ux500_msp_i2s.h b/sound/soc/ux500/ux500_msp_i2s.h index d5e4176..189a375 100644 --- a/sound/soc/ux500/ux500_msp_i2s.h +++ b/sound/soc/ux500/ux500_msp_i2s.h @@ -16,6 +16,7 @@ #define UX500_MSP_I2S_H #include +#include #define MSP_INPUT_FREQ_APB 48000000 @@ -365,13 +366,6 @@ enum msp_protocol { */ #define MAX_MSP_BACKUP_REGS 36 -enum enum_i2s_controller { - MSP_0_I2S_CONTROLLER = 0, - MSP_1_I2S_CONTROLLER, - MSP_2_I2S_CONTROLLER, - MSP_3_I2S_CONTROLLER, -}; - enum i2s_direction_t { MSP_DIR_TX = 0x01, MSP_DIR_RX = 0x02, @@ -475,7 +469,7 @@ struct ux500_msp_config { }; struct ux500_msp { - enum enum_i2s_controller id; + enum msp_i2s_id id; void __iomem *registers; struct device *dev; struct stedma40_chan_cfg *dma_cfg_rx;