mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Mark Brown <broonie@kernel.org>
To: Colin Ian King <colin.king@canonical.com>
Cc: Mark Brown <broonie@kernel.org>,
	Brian Austin <brian.austin@cirrus.com>,
	Paul Handrigan <Paul.Handrigan@cirrus.com>,
	Liam Girdwood <lgirdwood@gmail.com>,
	Mark Brown <broonie@kernel.org>, Jaroslav Kysela <perex@perex.cz>,
	Takashi Iwai <tiwai@suse.com>,
	alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org,
	alsa-devel@alsa-project.org
Subject: Applied "ASoC: cs43130: fix spelling mistake: "irq_occurrance" -> "irq_occurrence"" to the asoc tree
Date: Mon,  4 Sep 2017 13:46:31 +0100 (BST)	[thread overview]
Message-ID: <20170904124631.EB2F74400FC@finisterre.ee.mobilebroadband> (raw)
In-Reply-To: <20170904101232.22339-1-colin.king@canonical.com>

The patch

   ASoC: cs43130: fix spelling mistake: "irq_occurrance" -> "irq_occurrence"

has been applied to the asoc tree at

   git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git 

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.  

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

>From 83ef26ac1326fdd2fc8d160967cdca2e8b46ccd4 Mon Sep 17 00:00:00 2001
From: Colin Ian King <colin.king@canonical.com>
Date: Mon, 4 Sep 2017 11:12:32 +0100
Subject: [PATCH] ASoC: cs43130: fix spelling mistake: "irq_occurrance" ->
 "irq_occurrence"

Trivial fix to spelling mistake in variable name

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 sound/soc/codecs/cs43130.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sound/soc/codecs/cs43130.c b/sound/soc/codecs/cs43130.c
index 220e30199c5b..9f1aa0516fd0 100644
--- a/sound/soc/codecs/cs43130.c
+++ b/sound/soc/codecs/cs43130.c
@@ -2147,7 +2147,7 @@ static irqreturn_t cs43130_irq_thread(int irq, void *data)
 	struct cs43130_private *cs43130 = (struct cs43130_private *)data;
 	struct snd_soc_codec *codec = cs43130->codec;
 	unsigned int stickies[CS43130_NUM_INT];
-	unsigned int irq_occurrance = 0;
+	unsigned int irq_occurrence = 0;
 	unsigned int masks[CS43130_NUM_INT];
 	int i, j;
 
@@ -2161,12 +2161,12 @@ static irqreturn_t cs43130_irq_thread(int irq, void *data)
 	for (i = 0; i < ARRAY_SIZE(stickies); i++) {
 		stickies[i] = stickies[i] & (~masks[i]);
 		for (j = 0; j < 8; j++)
-			irq_occurrance += (stickies[i] >> j) & 1;
+			irq_occurrence += (stickies[i] >> j) & 1;
 	}
 	dev_dbg(codec->dev, "number of interrupts occurred (%u)\n",
-		irq_occurrance);
+		irq_occurrence);
 
-	if (!irq_occurrance)
+	if (!irq_occurrence)
 		return IRQ_NONE;
 
 	if (stickies[0] & CS43130_XTAL_RDY_INT) {
-- 
2.13.2

      reply	other threads:[~2017-09-04 12:46 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-09-04 10:12 [PATCH][sound-next] ASoC: cs43130: fix spelling mistake: "irq_occurrance" -> "irq_occurrence" Colin King
2017-09-04 12:46 ` Mark Brown [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170904124631.EB2F74400FC@finisterre.ee.mobilebroadband \
    --to=broonie@kernel.org \
    --cc=Paul.Handrigan@cirrus.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=brian.austin@cirrus.com \
    --cc=colin.king@canonical.com \
    --cc=lgirdwood@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=perex@perex.cz \
    --cc=tiwai@suse.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®