[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1344364969-32489-7-git-send-email-broonie@opensource.wolfsonmicro.com>
Date: Tue, 7 Aug 2012 19:42:49 +0100
From: Mark Brown <broonie@...nsource.wolfsonmicro.com>
To: Samuel Ortiz <sameo@...ux.intel.com>
Cc: linux-kernel@...r.kernel.org,
Haojian Zhuang <haojian.zhuang@...il.com>,
Benjamin Herrenschmidt <benh@...nel.crashing.org>,
Arnd Bergmann <arnd@...db.de>,
Russell King <rmk@....linux.org.uk>,
Mark Brown <broonie@...nsource.wolfsonmicro.com>
Subject: [PATCH 7/7] mfd: max8925: Convert to IORESOURCE_REG
Signed-off-by: Mark Brown <broonie@...nsource.wolfsonmicro.com>
---
drivers/mfd/max8925-core.c | 18 ++++--------------
drivers/video/backlight/max8925_bl.c | 2 +-
2 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/drivers/mfd/max8925-core.c b/drivers/mfd/max8925-core.c
index 6aa3a22..08a5723 100644
--- a/drivers/mfd/max8925-core.c
+++ b/drivers/mfd/max8925-core.c
@@ -18,19 +18,12 @@
#include <linux/mfd/core.h>
#include <linux/mfd/max8925.h>
-static struct resource io_parent = {
- .start = 0,
- .end = 0xffffffff,
- .flags = IORESOURCE_IO,
-};
-
static struct resource backlight_resources[] = {
{
.name = "max8925-backlight",
.start = MAX8925_WLED_MODE_CNTL,
.end = MAX8925_WLED_CNTL,
- .flags = IORESOURCE_IO,
- .parent = &io_parent,
+ .flags = IORESOURCE_REG,
},
};
@@ -48,8 +41,7 @@ static struct resource touch_resources[] = {
.name = "max8925-tsc",
.start = MAX8925_TSC_IRQ,
.end = MAX8925_ADC_RES_END,
- .flags = IORESOURCE_IO,
- .parent = &io_parent,
+ .flags = IORESOURCE_REG,
},
};
@@ -67,8 +59,7 @@ static struct resource power_supply_resources[] = {
.name = "max8925-power",
.start = MAX8925_CHG_IRQ1,
.end = MAX8925_CHG_IRQ1_MASK,
- .flags = IORESOURCE_IO,
- .parent = &io_parent,
+ .flags = IORESOURCE_REG,
},
};
@@ -126,8 +117,7 @@ static struct mfd_cell onkey_devs[] = {
{ \
.start = MAX8925_##_start, \
.end = MAX8925_##_end, \
- .flags = IORESOURCE_IO, \
- .parent = &io_parent, \
+ .flags = IORESOURCE_REG, \
}
static struct resource regulator_resources[] = {
diff --git a/drivers/video/backlight/max8925_bl.c b/drivers/video/backlight/max8925_bl.c
index e833ac7..996dadf 100644
--- a/drivers/video/backlight/max8925_bl.c
+++ b/drivers/video/backlight/max8925_bl.c
@@ -112,7 +112,7 @@ static int __devinit max8925_backlight_probe(struct platform_device *pdev)
unsigned char value;
int ret;
- res = platform_get_resource(pdev, IORESOURCE_IO, 0);
+ res = platform_get_resource(pdev, IORESOURCE_REG, 0);
if (res == NULL) {
dev_err(&pdev->dev, "No I/O resource!\n");
return -EINVAL;
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists