From: Adrian Hunter <adrian.hunter@intel.com>
To: Ulf Hansson <ulf.hansson@linaro.org>, Chris Ball <chris@printf.net>
Cc: linux-mmc <linux-mmc@vger.kernel.org>
Subject: [PATCH 07/15] mmc: sdhci: Use 'void *' for not 'u8 *' for ADMA data
Date: Tue, 21 Oct 2014 12:26:17 +0300 [thread overview]
Message-ID: <1413883585-16299-8-git-send-email-adrian.hunter@intel.com> (raw)
In-Reply-To: <1413883585-16299-1-git-send-email-adrian.hunter@intel.com>
It is kernel-style to use 'void *' for anonymous data.
This is being applied to the ADMA bounce buffer which
contains unaligned bytes, and to the ADMA descriptor
table which will contain 32-bit ADMA descriptors
or 64-bit ADMA descriptors when support is added.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
---
drivers/mmc/host/sdhci.c | 10 +++++-----
include/linux/mmc/sdhci.h | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 833e792..a4322e2 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -454,7 +454,7 @@ static void sdhci_kunmap_atomic(void *buffer, unsigned long *flags)
local_irq_restore(*flags);
}
-static void sdhci_adma_write_desc(u8 *desc, u32 addr, int len, unsigned cmd)
+static void sdhci_adma_write_desc(void *desc, u32 addr, int len, unsigned cmd)
{
__le32 *dataddr = (__le32 __force *)(desc + 4);
__le16 *cmdlen = (__le16 __force *)desc;
@@ -480,8 +480,8 @@ static int sdhci_adma_table_pre(struct sdhci_host *host,
{
int direction;
- u8 *desc;
- u8 *align;
+ void *desc;
+ void *align;
dma_addr_t addr;
dma_addr_t align_addr;
int len, offset;
@@ -606,7 +606,7 @@ static void sdhci_adma_table_post(struct sdhci_host *host,
struct scatterlist *sg;
int i, size;
- u8 *align;
+ void *align;
char *buffer;
unsigned long flags;
bool has_unaligned;
@@ -2300,7 +2300,7 @@ static void sdhci_cmd_irq(struct sdhci_host *host, u32 intmask, u32 *mask)
static void sdhci_adma_show_error(struct sdhci_host *host)
{
const char *name = mmc_hostname(host->mmc);
- u8 *desc = host->adma_table;
+ void *desc = host->adma_table;
__le32 *dma;
__le16 *len;
u8 attr;
diff --git a/include/linux/mmc/sdhci.h b/include/linux/mmc/sdhci.h
index 76e0432..933dbbb 100644
--- a/include/linux/mmc/sdhci.h
+++ b/include/linux/mmc/sdhci.h
@@ -155,8 +155,8 @@ struct sdhci_host {
int sg_count; /* Mapped sg entries */
- u8 *adma_table; /* ADMA descriptor table */
- u8 *align_buffer; /* Bounce buffer */
+ void *adma_table; /* ADMA descriptor table */
+ void *align_buffer; /* Bounce buffer */
dma_addr_t adma_addr; /* Mapped ADMA descr. table */
dma_addr_t align_addr; /* Mapped bounce buffer */
--
1.9.1
next prev parent reply other threads:[~2014-10-21 9:28 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-21 9:26 [PATCH 00/15] mmc: sdhci: Add 64-bit ADMA support Adrian Hunter
2014-10-21 9:26 ` [PATCH 01/15] mmc: sdhci: Fix incorrect ADMA2 descriptor table size Adrian Hunter
2014-10-21 9:26 ` [PATCH 02/15] mmc: sdhci: Fix ADMA page boundary warnings Adrian Hunter
2014-10-21 9:26 ` [PATCH 03/15] mmc: sdhci: Fix ADMA table size warning Adrian Hunter
2014-10-21 9:26 ` [PATCH 04/15] mmc: sdhci: Rename two ADMA-related functions for consistency Adrian Hunter
2014-10-21 9:26 ` [PATCH 05/15] mmc: sdhci: Rename adma_desc to adma_table Adrian Hunter
2014-10-21 9:26 ` [PATCH 06/15] mmc: sdhci: Add sdhci_adma_mark_end() Adrian Hunter
2014-10-21 9:26 ` Adrian Hunter [this message]
2014-10-21 9:26 ` [PATCH 08/15] mmc: sdhci: Parameterize ADMA sizes and alignment Adrian Hunter
2014-10-21 9:26 ` [PATCH 09/15] mmc: sdhci: Define maximum segments Adrian Hunter
2014-10-21 9:26 ` [PATCH 10/15] mmc: sdhci: Define ADMA constants Adrian Hunter
2014-10-21 9:26 ` [PATCH 11/15] mmc: sdhci: Define ADMA descriptor structure Adrian Hunter
2014-10-21 9:26 ` [PATCH 12/15] mmc: sdhci: Add 64-bit ADMA support Adrian Hunter
2014-10-21 9:26 ` [PATCH 13/15] mmc: sdhci-acpi: Add 64-bit DMA support Adrian Hunter
2014-10-21 9:33 ` Arnd Bergmann
2014-10-21 10:45 ` Adrian Hunter
2014-10-21 11:05 ` Arnd Bergmann
2014-10-28 8:37 ` [PATCH V2] " Adrian Hunter
2014-10-28 9:43 ` Arnd Bergmann
2014-10-28 10:05 ` Adrian Hunter
2014-10-28 10:18 ` Arnd Bergmann
2014-10-28 11:41 ` Adrian Hunter
2014-10-28 13:54 ` Arnd Bergmann
2014-10-28 14:14 ` Adrian Hunter
2014-10-28 15:08 ` Arnd Bergmann
2014-10-28 15:14 ` Adrian Hunter
2014-10-28 15:38 ` Arnd Bergmann
2014-10-29 8:53 ` Adrian Hunter
2014-10-21 9:26 ` [PATCH 14/15] mmc: sdhci-pci: " Adrian Hunter
2014-10-21 9:26 ` [PATCH 15/15] mmc: mmc_test: Extend "Badly aligned" tests for 8-byte alignment Adrian Hunter
2014-10-30 7:25 ` [PATCH 00/15] mmc: sdhci: Add 64-bit ADMA support Adrian Hunter
2014-10-30 8:05 ` Arnd Bergmann
2014-10-30 8:40 ` Adrian Hunter
2014-10-30 10:00 ` Arnd Bergmann
2014-10-30 10:50 ` Adrian Hunter
2014-10-30 12:15 ` Arnd Bergmann
2014-10-30 12:55 ` Adrian Hunter
2014-11-03 8:28 ` Adrian Hunter
2014-11-03 14:40 ` Ulf Hansson
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=1413883585-16299-8-git-send-email-adrian.hunter@intel.com \
--to=adrian.hunter@intel.com \
--cc=chris@printf.net \
--cc=linux-mmc@vger.kernel.org \
--cc=ulf.hansson@linaro.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