From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
linux-arm-kernel@lists.infradead.org, linux-spi@vger.kernel.org,
linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org
Cc: Daniel Mack <daniel@zonque.org>,
Haojian Zhuang <haojian.zhuang@gmail.com>,
Robert Jarzmik <robert.jarzmik@free.fr>,
Mark Brown <broonie@kernel.org>,
Liam Girdwood <lgirdwood@gmail.com>,
Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>
Subject: [PATCH v2 08/14] spi: pxa2xx: Reuse int_error_stop() in pxa2xx_spi_slave_abort()
Date: Fri, 23 Apr 2021 21:24:35 +0300 [thread overview]
Message-ID: <20210423182441.50272-9-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20210423182441.50272-1-andriy.shevchenko@linux.intel.com>
It appears that pxa2xx_spi_slave_abort()almost repeats the functionality
of the int_error_stop(). Reuse int_error_stop() in pxa2xx_spi_slave_abort().
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/spi/spi-pxa2xx.c | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c
index 4dab47e18d10..85a8d228a117 100644
--- a/drivers/spi/spi-pxa2xx.c
+++ b/drivers/spi/spi-pxa2xx.c
@@ -631,7 +631,7 @@ static void int_stop_and_reset(struct driver_data *drv_data)
pxa2xx_spi_write(drv_data, SSTO, 0);
}
-static void int_error_stop(struct driver_data *drv_data, const char *msg)
+static void int_error_stop(struct driver_data *drv_data, const char *msg, int err)
{
int_stop_and_reset(drv_data);
pxa2xx_spi_flush(drv_data);
@@ -639,7 +639,7 @@ static void int_error_stop(struct driver_data *drv_data, const char *msg)
dev_err(drv_data->ssp->dev, "%s\n", msg);
- drv_data->controller->cur_msg->status = -EIO;
+ drv_data->controller->cur_msg->status = err;
spi_finalize_current_transfer(drv_data->controller);
}
@@ -658,12 +658,12 @@ static irqreturn_t interrupt_transfer(struct driver_data *drv_data)
u32 irq_status = pxa2xx_spi_read(drv_data, SSSR) & irq_mask;
if (irq_status & SSSR_ROR) {
- int_error_stop(drv_data, "interrupt_transfer: fifo overrun");
+ int_error_stop(drv_data, "interrupt_transfer: fifo overrun", -EIO);
return IRQ_HANDLED;
}
if (irq_status & SSSR_TUR) {
- int_error_stop(drv_data, "interrupt_transfer: fifo underrun");
+ int_error_stop(drv_data, "interrupt_transfer: fifo underrun", -EIO);
return IRQ_HANDLED;
}
@@ -1154,14 +1154,7 @@ static int pxa2xx_spi_slave_abort(struct spi_controller *controller)
{
struct driver_data *drv_data = spi_controller_get_devdata(controller);
- int_stop_and_reset(drv_data);
- pxa2xx_spi_flush(drv_data);
- pxa2xx_spi_off(drv_data);
-
- dev_dbg(drv_data->ssp->dev, "transfer aborted\n");
-
- drv_data->controller->cur_msg->status = -EINTR;
- spi_finalize_current_transfer(drv_data->controller);
+ int_error_stop(drv_data, "transfer aborted", -EINTR);
return 0;
}
--
2.30.2
WARNING: multiple messages have this Message-ID (diff)
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
linux-arm-kernel@lists.infradead.org, linux-spi@vger.kernel.org,
linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org
Cc: Takashi Iwai <tiwai@suse.com>,
Liam Girdwood <lgirdwood@gmail.com>,
Haojian Zhuang <haojian.zhuang@gmail.com>,
Mark Brown <broonie@kernel.org>,
Robert Jarzmik <robert.jarzmik@free.fr>,
Daniel Mack <daniel@zonque.org>
Subject: [PATCH v2 08/14] spi: pxa2xx: Reuse int_error_stop() in pxa2xx_spi_slave_abort()
Date: Fri, 23 Apr 2021 21:24:35 +0300 [thread overview]
Message-ID: <20210423182441.50272-9-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20210423182441.50272-1-andriy.shevchenko@linux.intel.com>
It appears that pxa2xx_spi_slave_abort()almost repeats the functionality
of the int_error_stop(). Reuse int_error_stop() in pxa2xx_spi_slave_abort().
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/spi/spi-pxa2xx.c | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c
index 4dab47e18d10..85a8d228a117 100644
--- a/drivers/spi/spi-pxa2xx.c
+++ b/drivers/spi/spi-pxa2xx.c
@@ -631,7 +631,7 @@ static void int_stop_and_reset(struct driver_data *drv_data)
pxa2xx_spi_write(drv_data, SSTO, 0);
}
-static void int_error_stop(struct driver_data *drv_data, const char *msg)
+static void int_error_stop(struct driver_data *drv_data, const char *msg, int err)
{
int_stop_and_reset(drv_data);
pxa2xx_spi_flush(drv_data);
@@ -639,7 +639,7 @@ static void int_error_stop(struct driver_data *drv_data, const char *msg)
dev_err(drv_data->ssp->dev, "%s\n", msg);
- drv_data->controller->cur_msg->status = -EIO;
+ drv_data->controller->cur_msg->status = err;
spi_finalize_current_transfer(drv_data->controller);
}
@@ -658,12 +658,12 @@ static irqreturn_t interrupt_transfer(struct driver_data *drv_data)
u32 irq_status = pxa2xx_spi_read(drv_data, SSSR) & irq_mask;
if (irq_status & SSSR_ROR) {
- int_error_stop(drv_data, "interrupt_transfer: fifo overrun");
+ int_error_stop(drv_data, "interrupt_transfer: fifo overrun", -EIO);
return IRQ_HANDLED;
}
if (irq_status & SSSR_TUR) {
- int_error_stop(drv_data, "interrupt_transfer: fifo underrun");
+ int_error_stop(drv_data, "interrupt_transfer: fifo underrun", -EIO);
return IRQ_HANDLED;
}
@@ -1154,14 +1154,7 @@ static int pxa2xx_spi_slave_abort(struct spi_controller *controller)
{
struct driver_data *drv_data = spi_controller_get_devdata(controller);
- int_stop_and_reset(drv_data);
- pxa2xx_spi_flush(drv_data);
- pxa2xx_spi_off(drv_data);
-
- dev_dbg(drv_data->ssp->dev, "transfer aborted\n");
-
- drv_data->controller->cur_msg->status = -EINTR;
- spi_finalize_current_transfer(drv_data->controller);
+ int_error_stop(drv_data, "transfer aborted", -EINTR);
return 0;
}
--
2.30.2
WARNING: multiple messages have this Message-ID (diff)
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
linux-arm-kernel@lists.infradead.org, linux-spi@vger.kernel.org,
linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org
Cc: Daniel Mack <daniel@zonque.org>,
Haojian Zhuang <haojian.zhuang@gmail.com>,
Robert Jarzmik <robert.jarzmik@free.fr>,
Mark Brown <broonie@kernel.org>,
Liam Girdwood <lgirdwood@gmail.com>,
Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>
Subject: [PATCH v2 08/14] spi: pxa2xx: Reuse int_error_stop() in pxa2xx_spi_slave_abort()
Date: Fri, 23 Apr 2021 21:24:35 +0300 [thread overview]
Message-ID: <20210423182441.50272-9-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20210423182441.50272-1-andriy.shevchenko@linux.intel.com>
It appears that pxa2xx_spi_slave_abort()almost repeats the functionality
of the int_error_stop(). Reuse int_error_stop() in pxa2xx_spi_slave_abort().
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/spi/spi-pxa2xx.c | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c
index 4dab47e18d10..85a8d228a117 100644
--- a/drivers/spi/spi-pxa2xx.c
+++ b/drivers/spi/spi-pxa2xx.c
@@ -631,7 +631,7 @@ static void int_stop_and_reset(struct driver_data *drv_data)
pxa2xx_spi_write(drv_data, SSTO, 0);
}
-static void int_error_stop(struct driver_data *drv_data, const char *msg)
+static void int_error_stop(struct driver_data *drv_data, const char *msg, int err)
{
int_stop_and_reset(drv_data);
pxa2xx_spi_flush(drv_data);
@@ -639,7 +639,7 @@ static void int_error_stop(struct driver_data *drv_data, const char *msg)
dev_err(drv_data->ssp->dev, "%s\n", msg);
- drv_data->controller->cur_msg->status = -EIO;
+ drv_data->controller->cur_msg->status = err;
spi_finalize_current_transfer(drv_data->controller);
}
@@ -658,12 +658,12 @@ static irqreturn_t interrupt_transfer(struct driver_data *drv_data)
u32 irq_status = pxa2xx_spi_read(drv_data, SSSR) & irq_mask;
if (irq_status & SSSR_ROR) {
- int_error_stop(drv_data, "interrupt_transfer: fifo overrun");
+ int_error_stop(drv_data, "interrupt_transfer: fifo overrun", -EIO);
return IRQ_HANDLED;
}
if (irq_status & SSSR_TUR) {
- int_error_stop(drv_data, "interrupt_transfer: fifo underrun");
+ int_error_stop(drv_data, "interrupt_transfer: fifo underrun", -EIO);
return IRQ_HANDLED;
}
@@ -1154,14 +1154,7 @@ static int pxa2xx_spi_slave_abort(struct spi_controller *controller)
{
struct driver_data *drv_data = spi_controller_get_devdata(controller);
- int_stop_and_reset(drv_data);
- pxa2xx_spi_flush(drv_data);
- pxa2xx_spi_off(drv_data);
-
- dev_dbg(drv_data->ssp->dev, "transfer aborted\n");
-
- drv_data->controller->cur_msg->status = -EINTR;
- spi_finalize_current_transfer(drv_data->controller);
+ int_error_stop(drv_data, "transfer aborted", -EINTR);
return 0;
}
--
2.30.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-04-23 18:25 UTC|newest]
Thread overview: 105+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-23 18:24 [PATCH v2 00/14] spi: pxa2xx: Set of cleanups Andy Shevchenko
2021-04-23 18:24 ` Andy Shevchenko
2021-04-23 18:24 ` Andy Shevchenko
2021-04-23 18:24 ` [PATCH v2 01/14] spi: pxa2xx: Use one point of return when ->probe() fails Andy Shevchenko
2021-04-23 18:24 ` Andy Shevchenko
2021-04-23 18:24 ` Andy Shevchenko
2021-04-23 18:24 ` [PATCH v2 02/14] spi: pxa2xx: Utilize MMIO and physical base from struct ssp_device Andy Shevchenko
2021-04-23 18:24 ` Andy Shevchenko
2021-04-23 18:24 ` Andy Shevchenko
2021-04-23 18:24 ` [PATCH v2 03/14] spi: pxa2xx: Utilize struct device " Andy Shevchenko
2021-04-23 18:24 ` Andy Shevchenko
2021-04-23 18:24 ` Andy Shevchenko
2021-04-23 18:24 ` [PATCH v2 04/14] spi: pxa2xx: Replace header inclusions by forward declarations Andy Shevchenko
2021-04-23 18:24 ` Andy Shevchenko
2021-04-23 18:24 ` Andy Shevchenko
2021-04-23 18:24 ` [PATCH v2 05/14] spi: pxa2xx: Unify ifdeffery used in the headers Andy Shevchenko
2021-04-23 18:24 ` Andy Shevchenko
2021-04-23 18:24 ` Andy Shevchenko
2021-04-23 18:24 ` [PATCH v2 06/14] spi: pxa2xx: Group Intel Quark specific definitions Andy Shevchenko
2021-04-23 18:24 ` Andy Shevchenko
2021-04-23 18:24 ` Andy Shevchenko
2021-04-23 18:24 ` [PATCH v2 07/14] spi: pxa2xx: Introduce int_stop_and_reset() helper Andy Shevchenko
2021-04-23 18:24 ` Andy Shevchenko
2021-04-23 18:24 ` Andy Shevchenko
2021-05-10 12:09 ` Mark Brown
2021-05-10 12:09 ` Mark Brown
2021-05-10 12:09 ` Mark Brown
2021-05-10 12:38 ` Andy Shevchenko
2021-05-10 12:38 ` Andy Shevchenko
2021-05-10 12:38 ` Andy Shevchenko
2021-05-10 13:57 ` Mark Brown
2021-05-10 13:57 ` Mark Brown
2021-05-10 13:57 ` Mark Brown
2021-04-23 18:24 ` Andy Shevchenko [this message]
2021-04-23 18:24 ` [PATCH v2 08/14] spi: pxa2xx: Reuse int_error_stop() in pxa2xx_spi_slave_abort() Andy Shevchenko
2021-04-23 18:24 ` Andy Shevchenko
2021-04-23 18:24 ` [PATCH v2 09/14] spi: pxa2xx: Use pxa_ssp_enable()/pxa_ssp_disable() in the driver Andy Shevchenko
2021-04-23 18:24 ` Andy Shevchenko
2021-04-23 18:24 ` Andy Shevchenko
2021-04-23 18:24 ` [PATCH v2 10/14] spi: pxa2xx: Extract pxa2xx_spi_update() helper Andy Shevchenko
2021-04-23 18:24 ` Andy Shevchenko
2021-04-23 18:24 ` Andy Shevchenko
2021-04-23 18:24 ` [PATCH v2 11/14] spi: pxa2xx: Extract clear_SSCR1_bits() helper Andy Shevchenko
2021-04-23 18:24 ` Andy Shevchenko
2021-04-23 18:24 ` Andy Shevchenko
2021-04-23 18:24 ` [PATCH v2 12/14] spi: pxa2xx: Extract read_SSSR_bits() helper Andy Shevchenko
2021-04-23 18:24 ` Andy Shevchenko
2021-04-23 18:24 ` Andy Shevchenko
2021-04-23 18:24 ` [PATCH v2 13/14] spi: pxa2xx: Constify struct driver_data parameter Andy Shevchenko
2021-04-23 18:24 ` Andy Shevchenko
2021-04-23 18:24 ` Andy Shevchenko
2021-04-23 18:24 ` [PATCH v2 14/14] spi: pxa2xx: Introduce special type for Merrifield SPIs Andy Shevchenko
2021-04-23 18:24 ` Andy Shevchenko
2021-04-23 18:24 ` Andy Shevchenko
2021-04-27 11:46 ` [PATCH v2 00/14] spi: pxa2xx: Set of cleanups Andy Shevchenko
2021-04-27 11:46 ` Andy Shevchenko
2021-04-27 11:46 ` Andy Shevchenko
2021-04-27 14:34 ` Mark Brown
2021-04-27 14:34 ` Mark Brown
2021-04-27 14:34 ` Mark Brown
2021-04-27 14:53 ` Andy Shevchenko
2021-04-27 14:53 ` Andy Shevchenko
2021-04-27 14:53 ` Andy Shevchenko
2021-04-30 16:29 ` Andy Shevchenko
2021-04-30 16:29 ` Andy Shevchenko
2021-04-30 16:29 ` Andy Shevchenko
2021-04-30 18:01 ` Mark Brown
2021-04-30 18:01 ` Mark Brown
2021-04-30 18:01 ` Mark Brown
2021-04-30 18:43 ` Andy Shevchenko
2021-04-30 18:43 ` Andy Shevchenko
2021-04-30 18:43 ` Andy Shevchenko
2021-05-11 8:25 ` Mark Brown
2021-05-11 8:25 ` Mark Brown
2021-05-11 8:25 ` Mark Brown
2021-05-11 12:28 ` Andy Shevchenko
2021-05-11 12:28 ` Andy Shevchenko
2021-05-11 12:28 ` Andy Shevchenko
2021-05-11 13:47 ` Mark Brown
2021-05-11 13:47 ` Mark Brown
2021-05-11 13:47 ` Mark Brown
2021-05-11 13:52 ` Andy Shevchenko
2021-05-11 13:52 ` Andy Shevchenko
2021-05-11 13:52 ` Andy Shevchenko
2021-05-11 13:56 ` Andy Shevchenko
2021-05-11 13:56 ` Andy Shevchenko
2021-05-11 13:56 ` Andy Shevchenko
2021-05-11 14:13 ` Andy Shevchenko
2021-05-11 14:13 ` Andy Shevchenko
2021-05-11 14:13 ` Andy Shevchenko
2021-05-11 14:24 ` Mark Brown
2021-05-11 14:24 ` Mark Brown
2021-05-11 14:24 ` Mark Brown
2021-05-11 14:28 ` Andy Shevchenko
2021-05-11 14:28 ` Andy Shevchenko
2021-05-11 14:28 ` Andy Shevchenko
2021-05-11 14:38 ` Mark Brown
2021-05-11 14:38 ` Mark Brown
2021-05-11 14:38 ` Mark Brown
2021-05-11 14:43 ` Andy Shevchenko
2021-05-11 14:43 ` Andy Shevchenko
2021-05-11 14:43 ` Andy Shevchenko
2021-05-11 14:23 ` Mark Brown
2021-05-11 14:23 ` Mark Brown
2021-05-11 14:23 ` 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=20210423182441.50272-9-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=daniel@zonque.org \
--cc=haojian.zhuang@gmail.com \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=perex@perex.cz \
--cc=robert.jarzmik@free.fr \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.