* [PATCH 1/2] mtd: fsl_ifc_nand: Use void type for IFC buffer
[not found] <1142754398.830922.1396889085115.JavaMail.zimbra@xes-inc.com>
@ 2014-04-07 16:58 ` Aaron Sierra
2014-05-21 0:40 ` Brian Norris
0 siblings, 1 reply; 2+ messages in thread
From: Aaron Sierra @ 2014-04-07 16:58 UTC (permalink / raw)
To: David Woodhouse, Brian Norris; +Cc: linux-mtd, Prabhakar Kushwaha
The IFC buffer is accessed via 8-bit and 16-bit accessors. Changing
the 'addr' member of 'struct fsl_ifc_nand_ctrl' from 'u8 __iomem *' to
'void __iomem *' eliminates the need for explicit casts when the
16-bit accessors are used.
Signed-off-by: Aaron Sierra <asierra@xes-inc.com>
---
drivers/mtd/nand/fsl_ifc_nand.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/drivers/mtd/nand/fsl_ifc_nand.c b/drivers/mtd/nand/fsl_ifc_nand.c
index 50d9161..79941c4 100644
--- a/drivers/mtd/nand/fsl_ifc_nand.c
+++ b/drivers/mtd/nand/fsl_ifc_nand.c
@@ -57,7 +57,7 @@ struct fsl_ifc_nand_ctrl {
struct nand_hw_control controller;
struct fsl_ifc_mtd *chips[FSL_IFC_BANK_COUNT];
- u8 __iomem *addr; /* Address of assigned IFC buffer */
+ void __iomem *addr; /* Address of assigned IFC buffer */
unsigned int page; /* Last page written to / read from */
unsigned int read_bytes;/* Number of bytes read during command */
unsigned int column; /* Saved column from SEQIN */
@@ -637,7 +637,7 @@ static void fsl_ifc_write_buf(struct mtd_info *mtd, const u8 *buf, int len)
len = bufsize - ifc_nand_ctrl->index;
}
- memcpy_toio(&ifc_nand_ctrl->addr[ifc_nand_ctrl->index], buf, len);
+ memcpy_toio(ifc_nand_ctrl->addr + ifc_nand_ctrl->index, buf, len);
ifc_nand_ctrl->index += len;
}
@@ -649,13 +649,16 @@ static uint8_t fsl_ifc_read_byte(struct mtd_info *mtd)
{
struct nand_chip *chip = mtd->priv;
struct fsl_ifc_mtd *priv = chip->priv;
+ unsigned int offset;
/*
* If there are still bytes in the IFC buffer, then use the
* next byte.
*/
- if (ifc_nand_ctrl->index < ifc_nand_ctrl->read_bytes)
- return in_8(&ifc_nand_ctrl->addr[ifc_nand_ctrl->index++]);
+ if (ifc_nand_ctrl->index < ifc_nand_ctrl->read_bytes) {
+ offset = ifc_nand_ctrl->index++;
+ return in_8(ifc_nand_ctrl->addr + offset);
+ }
dev_err(priv->dev, "%s: beyond end of buffer\n", __func__);
return ERR_BYTE;
@@ -676,8 +679,7 @@ static uint8_t fsl_ifc_read_byte16(struct mtd_info *mtd)
* next byte.
*/
if (ifc_nand_ctrl->index < ifc_nand_ctrl->read_bytes) {
- data = in_be16((uint16_t __iomem *)&ifc_nand_ctrl->
- addr[ifc_nand_ctrl->index]);
+ data = in_be16(ifc_nand_ctrl->addr + ifc_nand_ctrl->index);
ifc_nand_ctrl->index += 2;
return (uint8_t) data;
}
@@ -702,7 +704,7 @@ static void fsl_ifc_read_buf(struct mtd_info *mtd, u8 *buf, int len)
avail = min((unsigned int)len,
ifc_nand_ctrl->read_bytes - ifc_nand_ctrl->index);
- memcpy_fromio(buf, &ifc_nand_ctrl->addr[ifc_nand_ctrl->index], avail);
+ memcpy_fromio(buf, ifc_nand_ctrl->addr + ifc_nand_ctrl->index, avail);
ifc_nand_ctrl->index += avail;
if (len > avail)
--
1.7.9.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 1/2] mtd: fsl_ifc_nand: Use void type for IFC buffer
2014-04-07 16:58 ` [PATCH 1/2] mtd: fsl_ifc_nand: Use void type for IFC buffer Aaron Sierra
@ 2014-05-21 0:40 ` Brian Norris
0 siblings, 0 replies; 2+ messages in thread
From: Brian Norris @ 2014-05-21 0:40 UTC (permalink / raw)
To: Aaron Sierra; +Cc: linux-mtd, David Woodhouse, Prabhakar Kushwaha
On Mon, Apr 07, 2014 at 11:58:12AM -0500, Aaron Sierra wrote:
> The IFC buffer is accessed via 8-bit and 16-bit accessors. Changing
> the 'addr' member of 'struct fsl_ifc_nand_ctrl' from 'u8 __iomem *' to
> 'void __iomem *' eliminates the need for explicit casts when the
> 16-bit accessors are used.
>
> Signed-off-by: Aaron Sierra <asierra@xes-inc.com>
Pushed both to l2-mtd.git. Thanks!
Brian
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-05-21 0:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <1142754398.830922.1396889085115.JavaMail.zimbra@xes-inc.com>
2014-04-07 16:58 ` [PATCH 1/2] mtd: fsl_ifc_nand: Use void type for IFC buffer Aaron Sierra
2014-05-21 0:40 ` Brian Norris
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).