From: broonie@kernel.org (Mark Brown)
To: linux-arm-kernel@lists.infradead.org
Subject: Applied "spi: spi-s3c64xx: Add missing s3c64xx_ prefix to function names" to the spi tree
Date: Wed, 18 Apr 2018 12:40:49 +0100 [thread overview]
Message-ID: <E1f8lSD-00026j-Na@debutante> (raw)
In-Reply-To: <20180417142954.5507-5-s.nawrocki@samsung.com>
The patch
spi: spi-s3c64xx: Add missing s3c64xx_ prefix to function names
has been applied to the spi tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.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 3655d30c054816331820842b0a1db75f58aeadc9 Mon Sep 17 00:00:00 2001
From: Sylwester Nawrocki <s.nawrocki@samsung.com>
Date: Tue, 17 Apr 2018 16:29:51 +0200
Subject: [PATCH] spi: spi-s3c64xx: Add missing s3c64xx_ prefix to function
names
Add a s3c64xx_ prefix to remaining generic function names so it is clear
the code is part of the driver when grepping or looking at debug logs.
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Reviewed-by: Andi Shyti <andi@etezian.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
drivers/spi/spi-s3c64xx.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
index 38a5e9ce5f11..db33bc9b4147 100644
--- a/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@ -188,7 +188,7 @@ struct s3c64xx_spi_driver_data {
unsigned int port_id;
};
-static void flush_fifo(struct s3c64xx_spi_driver_data *sdd)
+static void s3c64xx_flush_fifo(struct s3c64xx_spi_driver_data *sdd)
{
void __iomem *regs = sdd->regs;
unsigned long loops;
@@ -348,8 +348,8 @@ static bool s3c64xx_spi_can_dma(struct spi_master *master,
return xfer->len > (FIFO_LVL_MASK(sdd) >> 1) + 1;
}
-static void enable_datapath(struct s3c64xx_spi_driver_data *sdd,
- struct spi_transfer *xfer, int dma_mode)
+static void s3c64xx_enable_datapath(struct s3c64xx_spi_driver_data *sdd,
+ struct spi_transfer *xfer, int dma_mode)
{
void __iomem *regs = sdd->regs;
u32 modecfg, chcfg;
@@ -439,8 +439,8 @@ static u32 s3c64xx_spi_wait_for_timeout(struct s3c64xx_spi_driver_data *sdd,
return RX_FIFO_LVL(status, sdd);
}
-static int wait_for_dma(struct s3c64xx_spi_driver_data *sdd,
- struct spi_transfer *xfer)
+static int s3c64xx_wait_for_dma(struct s3c64xx_spi_driver_data *sdd,
+ struct spi_transfer *xfer)
{
void __iomem *regs = sdd->regs;
unsigned long val;
@@ -482,8 +482,8 @@ static int wait_for_dma(struct s3c64xx_spi_driver_data *sdd,
return 0;
}
-static int wait_for_pio(struct s3c64xx_spi_driver_data *sdd,
- struct spi_transfer *xfer)
+static int s3c64xx_wait_for_pio(struct s3c64xx_spi_driver_data *sdd,
+ struct spi_transfer *xfer)
{
void __iomem *regs = sdd->regs;
unsigned long val;
@@ -666,7 +666,7 @@ static int s3c64xx_spi_transfer_one(struct spi_master *master,
sdd->state &= ~RXBUSY;
sdd->state &= ~TXBUSY;
- enable_datapath(sdd, xfer, use_dma);
+ s3c64xx_enable_datapath(sdd, xfer, use_dma);
/* Start the signals */
s3c64xx_spi_set_cs(spi, true);
@@ -674,9 +674,9 @@ static int s3c64xx_spi_transfer_one(struct spi_master *master,
spin_unlock_irqrestore(&sdd->lock, flags);
if (use_dma)
- status = wait_for_dma(sdd, xfer);
+ status = s3c64xx_wait_for_dma(sdd, xfer);
else
- status = wait_for_pio(sdd, xfer);
+ status = s3c64xx_wait_for_pio(sdd, xfer);
if (status) {
dev_err(&spi->dev, "I/O Error: rx-%d tx-%d res:rx-%c tx-%c len-%d\n",
@@ -694,7 +694,7 @@ static int s3c64xx_spi_transfer_one(struct spi_master *master,
dmaengine_terminate_all(sdd->rx_dma.ch);
}
} else {
- flush_fifo(sdd);
+ s3c64xx_flush_fifo(sdd);
}
return status;
@@ -928,7 +928,7 @@ static void s3c64xx_spi_hwinit(struct s3c64xx_spi_driver_data *sdd)
val |= (S3C64XX_SPI_TRAILCNT << S3C64XX_SPI_TRAILCNT_OFF);
writel(val, regs + S3C64XX_SPI_MODE_CFG);
- flush_fifo(sdd);
+ s3c64xx_flush_fifo(sdd);
}
#ifdef CONFIG_OF
--
2.17.0
next prev parent reply other threads:[~2018-04-18 11:40 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20180417143022epcas2p1185d48998a1659ce6580180ea6725607@epcas2p1.samsung.com>
2018-04-17 14:29 ` [PATCH v2 1/8] spi: spi-s3c64xx: Do not ignore timeout errors in polling I/O mode Sylwester Nawrocki
2018-04-17 14:29 ` [PATCH v2 2/8] spi: spi-s3c64xx: Remove unused driver data structure tgl_spi field Sylwester Nawrocki
2018-04-17 14:29 ` [PATCH v2 3/8] spi: spi-s3c64xx: Remove unused s3c64xx_spi_hwinit() function argument Sylwester Nawrocki
2018-04-17 14:29 ` [PATCH v2 4/8] spi: spi-s3c64xx: Drop unused enable_datapath() " Sylwester Nawrocki
2018-04-17 18:09 ` andi at etezian.org
2018-04-18 11:40 ` Applied "spi: spi-s3c64xx: Drop unused enable_datapath() function argument" to the spi tree Mark Brown
2018-04-17 14:29 ` [PATCH v2 5/8] spi: spi-s3c64xx: Add missing s3c64xx_ prefix to function names Sylwester Nawrocki
2018-04-17 18:11 ` andi at etezian.org
2018-04-18 11:40 ` Mark Brown [this message]
2018-04-17 14:29 ` [PATCH v2 6/8] spi: spi-s3c64xx: Fix indentation in the register offset definitions Sylwester Nawrocki
2018-04-18 10:47 ` Mark Brown
2018-04-18 12:17 ` Sylwester Nawrocki
2018-04-18 13:49 ` Mark Brown
2018-04-17 14:29 ` [PATCH v2 7/8] spi: spi-s3c64xx: Use local variable for FIFO length Sylwester Nawrocki
2018-04-17 18:14 ` andi at etezian.org
2018-04-18 11:40 ` Applied "spi: spi-s3c64xx: Use local variable for FIFO length" to the spi tree Mark Brown
2018-04-17 14:29 ` [PATCH v2 8/8] spi: spi-s3c64xx: Allow higher transfer lengths in polling IO mode Sylwester Nawrocki
2018-04-17 18:27 ` andi at etezian.org
2018-04-18 11:40 ` Applied "spi: spi-s3c64xx: Allow higher transfer lengths in polling IO mode" to the spi tree Mark Brown
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=E1f8lSD-00026j-Na@debutante \
--to=broonie@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
/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