From patchwork Sat Feb 25 10:29:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corina Palade X-Patchwork-Id: 9591985 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 078D960581 for ; Sat, 25 Feb 2017 21:25:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EF63828489 for ; Sat, 25 Feb 2017 21:25:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D6188284D3; Sat, 25 Feb 2017 21:25:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=no version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 274E428489 for ; Sat, 25 Feb 2017 21:25:44 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 9212C266B50; Sat, 25 Feb 2017 22:13:35 +0100 (CET) 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 C5B472670E9; Sat, 25 Feb 2017 11:30:11 +0100 (CET) Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by alsa0.perex.cz (Postfix) with ESMTP id EA3A52670E4 for ; Sat, 25 Feb 2017 11:30:09 +0100 (CET) Received: by mail-wm0-f65.google.com with SMTP id v77so6364194wmv.0 for ; Sat, 25 Feb 2017 02:30:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=06RE0RdpNXOYw+vs6LRxpnKNZLBDuykwwU+HoymgXXo=; b=m5uHyd0z5hquXTGWHCpckLkOvagqeyNuoGw7fykPoOJFVQHccSfyKe/6DOgjlBEFIr HkKTr0QzGEbS4zWQyiGPmAfJaLYWekqE6H48kuyN3bw2iIpwG+c5mRmo2Pb1OhNzsHth Kng3oLX4e8Z3JfNK8f7nmohMNvFFV1+eSVYzlKLGeCwRWieeDucSHM92QEi4TNZSvQUO 0S7nZXzHl57fdk+b9T1GgHJO9lr8oVyfmdYjHXt5MuPLyCz0+JSO22b0gkpWI6CnUXg3 FFf/Uke6iiFvm0ChWGDJm4QSs1QUbvNU+1fDiE0QA1Tzi8VwPxHnFKHV8shhVPBC0pgT 2CVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=06RE0RdpNXOYw+vs6LRxpnKNZLBDuykwwU+HoymgXXo=; b=pHIa48IVGl3k5hrWPdzJOLjSmjRjawlRnz1/dWyOV3hYkSOr9/x9T6rzMfDv2DUdcl P+sB3EJLCJh5T5fcxqtcWAiRLg80vyIlBa7OTKLVJm/K3/B9dSlyyJQgxMPT67AvKFUH 2p87IUUfnw6137ZLXD2pa/DczYB+7T+aLtqph4i8Mm62XObqb1ViMoHda0zdjjSyo0lO Hlw4Es3rwWnKkQBlhQCJRIgph//hSxg+oCBrO3DqB507/NKeTaaFqp6KZ8KSwlTw+XZM RuTdE/A6RBBHH9acgQ2LWwqTDv23h/4a5dLBwimse1xbzzGunhqTl7IjxkS22KDbTNOk hFew== X-Gm-Message-State: AMke39luYVvIWOAOq++Xjk43ZKbZMI9r/imTM9J/CP7OcxK3DVZ3/ng5a0GamiUqzCo0vA== X-Received: by 10.28.158.82 with SMTP id h79mr6448326wme.30.1488018608997; Sat, 25 Feb 2017 02:30:08 -0800 (PST) Received: from localhost.localdomain ([141.85.225.206]) by smtp.gmail.com with ESMTPSA id w126sm6091906wmw.0.2017.02.25.02.30.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 25 Feb 2017 02:30:08 -0800 (PST) From: Corina Palade To: jcmvbkbc@gmail.com, tiwai@suse.com, perex@perex.cz Date: Sat, 25 Feb 2017 02:29:58 -0800 Message-Id: <1488018598-13338-1-git-send-email-corina.palade103@gmail.com> X-Mailer: git-send-email 2.7.4 X-Mailman-Approved-At: Sat, 25 Feb 2017 22:13:25 +0100 Cc: linux-xtensa@linux-xtensa.org, alsa-devel@alsa-project.org, lgirdwood@gmail.com, linux-kernel@vger.kernel.org, corina.palade103@gmail.com, broonie@kernel.org Subject: [alsa-devel] [PATCH] soc: xtensa: Replace "unsigned" with "unsigned int" 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: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP This was reported by checkpatch.pl. Signed-off-by: Corina Palade --- sound/soc/xtensa/xtfpga-i2s.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/sound/soc/xtensa/xtfpga-i2s.c b/sound/soc/xtensa/xtfpga-i2s.c index 8382ffa..01a2622 100644 --- a/sound/soc/xtensa/xtfpga-i2s.c +++ b/sound/soc/xtensa/xtfpga-i2s.c @@ -76,22 +76,22 @@ struct xtfpga_i2s { * handler by means of synchronize_rcu call. */ struct snd_pcm_substream __rcu *tx_substream; - unsigned (*tx_fn)(struct xtfpga_i2s *i2s, + unsigned int (*tx_fn)(struct xtfpga_i2s *i2s, struct snd_pcm_runtime *runtime, - unsigned tx_ptr); - unsigned tx_ptr; /* next frame index in the sample buffer */ + unsigned int tx_ptr); + unsigned int tx_ptr; /* next frame index in the sample buffer */ /* current fifo level estimate. * Doesn't have to be perfectly accurate, but must be not less than * the actual FIFO level in order to avoid stall on push attempt. */ - unsigned tx_fifo_level; + unsigned int tx_fifo_level; /* FIFO level at which level interrupt occurs */ - unsigned tx_fifo_low; + unsigned int tx_fifo_low; /* maximal FIFO level */ - unsigned tx_fifo_high; + unsigned int tx_fifo_high; }; static bool xtfpga_i2s_wr_reg(struct device *dev, unsigned int reg) @@ -130,9 +130,9 @@ static const struct regmap_config xtfpga_i2s_regmap_config = { * the LSB of each word is used. */ #define xtfpga_pcm_tx_fn(channels, sample_bits) \ -static unsigned xtfpga_pcm_tx_##channels##x##sample_bits( \ +static unsigned int xtfpga_pcm_tx_##channels##x##sample_bits( \ struct xtfpga_i2s *i2s, struct snd_pcm_runtime *runtime, \ - unsigned tx_ptr) \ + unsigned int tx_ptr) \ { \ const u##sample_bits (*p)[channels] = \ (void *)runtime->dma_area; \ @@ -165,8 +165,8 @@ static bool xtfpga_pcm_push_tx(struct xtfpga_i2s *i2s) tx_substream = rcu_dereference(i2s->tx_substream); tx_active = tx_substream && snd_pcm_running(tx_substream); if (tx_active) { - unsigned tx_ptr = ACCESS_ONCE(i2s->tx_ptr); - unsigned new_tx_ptr = i2s->tx_fn(i2s, tx_substream->runtime, + unsigned int tx_ptr = ACCESS_ONCE(i2s->tx_ptr); + unsigned int new_tx_ptr = i2s->tx_fn(i2s, tx_substream->runtime, tx_ptr); cmpxchg(&i2s->tx_ptr, tx_ptr, new_tx_ptr); @@ -178,8 +178,8 @@ static bool xtfpga_pcm_push_tx(struct xtfpga_i2s *i2s) static void xtfpga_pcm_refill_fifo(struct xtfpga_i2s *i2s) { - unsigned int_status; - unsigned i; + unsigned int int_status; + unsigned int i; regmap_read(i2s->regmap, XTFPGA_I2S_INT_STATUS, &int_status); @@ -227,7 +227,7 @@ static irqreturn_t xtfpga_i2s_threaded_irq_handler(int irq, void *dev_id) { struct xtfpga_i2s *i2s = dev_id; struct snd_pcm_substream *tx_substream; - unsigned config, int_status, int_mask; + unsigned int config, int_status, int_mask; regmap_read(i2s->regmap, XTFPGA_I2S_CONFIG, &config); regmap_read(i2s->regmap, XTFPGA_I2S_INT_MASK, &int_mask); @@ -284,11 +284,11 @@ static int xtfpga_i2s_hw_params(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { struct xtfpga_i2s *i2s = snd_soc_dai_get_drvdata(dai); - unsigned srate = params_rate(params); - unsigned channels = params_channels(params); - unsigned period_size = params_period_size(params); - unsigned sample_size = snd_pcm_format_width(params_format(params)); - unsigned freq, ratio, level; + unsigned int srate = params_rate(params); + unsigned int channels = params_channels(params); + unsigned int period_size = params_period_size(params); + unsigned int sample_size = snd_pcm_format_width(params_format(params)); + unsigned int freq, ratio, level; int err; regmap_update_bits(i2s->regmap, XTFPGA_I2S_CONFIG, @@ -393,7 +393,7 @@ static int xtfpga_pcm_hw_params(struct snd_pcm_substream *substream, int ret; struct snd_pcm_runtime *runtime = substream->runtime; struct xtfpga_i2s *i2s = runtime->private_data; - unsigned channels = params_channels(hw_params); + unsigned int channels = params_channels(hw_params); switch (channels) { case 1: