提交 448791ab 编写于 作者: H H Hartley Sweeten 提交者: David Woodhouse

mtd: tmio_nand.c: use dev_get_platdata() and resource_size()

Remove unnecessary casts and use dev_get_platdata() to retrieve the
struct mfd_cell data from the platform.

Use resource_size() for the ioremap()'s.
Signed-off-by: NH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: NDavid Woodhouse <David.Woodhouse@intel.com>
上级 fc161c4e
...@@ -318,7 +318,7 @@ static int tmio_nand_correct_data(struct mtd_info *mtd, unsigned char *buf, ...@@ -318,7 +318,7 @@ static int tmio_nand_correct_data(struct mtd_info *mtd, unsigned char *buf,
static int tmio_hw_init(struct platform_device *dev, struct tmio_nand *tmio) static int tmio_hw_init(struct platform_device *dev, struct tmio_nand *tmio)
{ {
struct mfd_cell *cell = (struct mfd_cell *)dev->dev.platform_data; struct mfd_cell *cell = dev_get_platdata(&dev->dev);
int ret; int ret;
if (cell->enable) { if (cell->enable) {
...@@ -362,7 +362,7 @@ static int tmio_hw_init(struct platform_device *dev, struct tmio_nand *tmio) ...@@ -362,7 +362,7 @@ static int tmio_hw_init(struct platform_device *dev, struct tmio_nand *tmio)
static void tmio_hw_stop(struct platform_device *dev, struct tmio_nand *tmio) static void tmio_hw_stop(struct platform_device *dev, struct tmio_nand *tmio)
{ {
struct mfd_cell *cell = (struct mfd_cell *)dev->dev.platform_data; struct mfd_cell *cell = dev_get_platdata(&dev->dev);
tmio_iowrite8(FCR_MODE_POWER_OFF, tmio->fcr + FCR_MODE); tmio_iowrite8(FCR_MODE_POWER_OFF, tmio->fcr + FCR_MODE);
if (cell->disable) if (cell->disable)
...@@ -371,7 +371,7 @@ static void tmio_hw_stop(struct platform_device *dev, struct tmio_nand *tmio) ...@@ -371,7 +371,7 @@ static void tmio_hw_stop(struct platform_device *dev, struct tmio_nand *tmio)
static int tmio_probe(struct platform_device *dev) static int tmio_probe(struct platform_device *dev)
{ {
struct mfd_cell *cell = (struct mfd_cell *)dev->dev.platform_data; struct mfd_cell *cell = dev_get_platdata(&dev->dev);
struct tmio_nand_data *data = cell->driver_data; struct tmio_nand_data *data = cell->driver_data;
struct resource *fcr = platform_get_resource(dev, struct resource *fcr = platform_get_resource(dev,
IORESOURCE_MEM, 0); IORESOURCE_MEM, 0);
...@@ -404,14 +404,14 @@ static int tmio_probe(struct platform_device *dev) ...@@ -404,14 +404,14 @@ static int tmio_probe(struct platform_device *dev)
mtd->priv = nand_chip; mtd->priv = nand_chip;
mtd->name = "tmio-nand"; mtd->name = "tmio-nand";
tmio->ccr = ioremap(ccr->start, ccr->end - ccr->start + 1); tmio->ccr = ioremap(ccr->start, resource_size(ccr));
if (!tmio->ccr) { if (!tmio->ccr) {
retval = -EIO; retval = -EIO;
goto err_iomap_ccr; goto err_iomap_ccr;
} }
tmio->fcr_base = fcr->start & 0xfffff; tmio->fcr_base = fcr->start & 0xfffff;
tmio->fcr = ioremap(fcr->start, fcr->end - fcr->start + 1); tmio->fcr = ioremap(fcr->start, resource_size(fcr));
if (!tmio->fcr) { if (!tmio->fcr) {
retval = -EIO; retval = -EIO;
goto err_iomap_fcr; goto err_iomap_fcr;
...@@ -515,7 +515,7 @@ static int tmio_remove(struct platform_device *dev) ...@@ -515,7 +515,7 @@ static int tmio_remove(struct platform_device *dev)
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int tmio_suspend(struct platform_device *dev, pm_message_t state) static int tmio_suspend(struct platform_device *dev, pm_message_t state)
{ {
struct mfd_cell *cell = (struct mfd_cell *)dev->dev.platform_data; struct mfd_cell *cell = dev_get_platdata(&dev->dev);
if (cell->suspend) if (cell->suspend)
cell->suspend(dev); cell->suspend(dev);
...@@ -526,7 +526,7 @@ static int tmio_suspend(struct platform_device *dev, pm_message_t state) ...@@ -526,7 +526,7 @@ static int tmio_suspend(struct platform_device *dev, pm_message_t state)
static int tmio_resume(struct platform_device *dev) static int tmio_resume(struct platform_device *dev)
{ {
struct mfd_cell *cell = (struct mfd_cell *)dev->dev.platform_data; struct mfd_cell *cell = dev_get_platdata(&dev->dev);
/* FIXME - is this required or merely another attack of the broken /* FIXME - is this required or merely another attack of the broken
* SHARP platform? Looks suspicious. * SHARP platform? Looks suspicious.
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册