linux-kernel - [PATCH] mfd: mc13xxx: make it possible to use the codec without pdata

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <1376396148-29801-1-git-send-email-m.grzeschik@pengutronix.de>
Date:	Tue, 13 Aug 2013 14:15:48 +0200
From:	Michael Grzeschik <m.grzeschik@...gutronix.de>
To:	Samuel Ortiz <sameo@...ux.intel.com>
Cc:	linux-kernel@...r.kernel.org, kernel@...gutronix.de
Subject: [PATCH] mfd: mc13xxx: make it possible to use the codec without pdata

In case of devicetree, we currently don't have a way to append pdata for
the codec. This patch makes it possible to probe the codec without pdata
for that case.

Signed-off-by: Michael Grzeschik <m.grzeschik@...gutronix.de>
---
 drivers/mfd/mc13xxx-core.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/mfd/mc13xxx-core.c b/drivers/mfd/mc13xxx-core.c
index 278601f..e1b89e6 100644
--- a/drivers/mfd/mc13xxx-core.c
+++ b/drivers/mfd/mc13xxx-core.c
@@ -687,10 +687,6 @@ err_revision:
 	if (mc13xxx->flags & MC13XXX_USE_ADC)
 		mc13xxx_add_subdevice(mc13xxx, "%s-adc");
 
-	if (mc13xxx->flags & MC13XXX_USE_CODEC)
-		mc13xxx_add_subdevice_pdata(mc13xxx, "%s-codec",
-					pdata->codec, sizeof(*pdata->codec));
-
 	if (mc13xxx->flags & MC13XXX_USE_RTC)
 		mc13xxx_add_subdevice(mc13xxx, "%s-rtc");
 
@@ -705,6 +701,10 @@ err_revision:
 		if (mc13xxx->flags & MC13XXX_USE_TOUCHSCREEN)
 			mc13xxx_add_subdevice_pdata(mc13xxx, "%s-ts",
 					&pdata->touch, sizeof(pdata->touch));
+
+		if (mc13xxx->flags & MC13XXX_USE_CODEC)
+			mc13xxx_add_subdevice_pdata(mc13xxx, "%s-codec",
+					pdata->codec, sizeof(*pdata->codec));
 	} else {
 		mc13xxx_add_subdevice(mc13xxx, "%s-regulator");
 		mc13xxx_add_subdevice(mc13xxx, "%s-led");
@@ -712,6 +712,9 @@ err_revision:
 
 		if (mc13xxx->flags & MC13XXX_USE_TOUCHSCREEN)
 			mc13xxx_add_subdevice(mc13xxx, "%s-ts");
+
+		if (mc13xxx->flags & MC13XXX_USE_CODEC)
+			mc13xxx_add_subdevice(mc13xxx, "%s-codec");
 	}
 
 	return 0;
-- 
1.8.4.rc2

--
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/