[RFC PATCH 0/3] pcmcia: odd fixes for v4.16-rc1

[RFC PATCH 0/3] pcmcia: odd fixes for v4.16-rc1

[Dominik Brodowski]

In the past couple of years, the linux-pcmcia mailing list had a pretty bad
signal-to-noise ratio. Therefore, it was shut down for good. This means an
update to MAINTAINERS is in order. If no-one else steps in, I will try to
route the few odd fixes for pcmcia upstream. Also, throw in two odd fixes
to this patch set.

Arvind Yadav (1):
  pcmcia: soc_common: Handle return value of clk_prepare_enable

Dominik Brodowski (2):
  pcmcia: remove mailing list, update MAINTAINERS
  pcmcia: use proper printk format for resource

 MAINTAINERS                     | 6 ++----
 drivers/pcmcia/rsrc_nonstatic.c | 2 +-
 drivers/pcmcia/soc_common.c     | 8 ++++++--
 3 files changed, 9 insertions(+), 7 deletions(-)

-- 
2.16.1

[RFC PATCH 1/3] pcmcia: remove mailing list, update MAINTAINERS

[Dominik Brodowski]

In recent years, the linux-pcmcia mailing list gained a pretty bad
signal-to-noise ratio. It does not seem worth the hassle to keep it
any longer. Thanks to David for hosting the list for the last couple
of years!

Acked-by: David Woodhouse <dwmw2@infradead.org>
CC: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
---
 MAINTAINERS | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index e3581413420c..3dc821ddfc6b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -10641,11 +10641,9 @@ S:	Maintained
 F:	drivers/pci/dwc/*spear*
 
 PCMCIA SUBSYSTEM
-P:	Linux PCMCIA Team
-L:	linux-pcmcia@lists.infradead.org
-W:	http://lists.infradead.org/mailman/listinfo/linux-pcmcia
+M:	Dominik Brodowski <linux@dominikbrodowski.net>
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia.git
-S:	Maintained
+S:	Odd Fixes
 F:	Documentation/pcmcia/
 F:	tools/pcmcia/
 F:	drivers/pcmcia/
-- 
2.16.1

[RFC PATCH 2/3] pcmcia: use proper printk format for resource

[Dominik Brodowski]

Even though it is just in a dev_dbg statement, improve the printk format
to use %pr instead of plain %p.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
---
 drivers/pcmcia/rsrc_nonstatic.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/pcmcia/rsrc_nonstatic.c b/drivers/pcmcia/rsrc_nonstatic.c
index 5ef7b46a2578..49377d502b74 100644
--- a/drivers/pcmcia/rsrc_nonstatic.c
+++ b/drivers/pcmcia/rsrc_nonstatic.c
@@ -367,7 +367,7 @@ static int do_validate_mem(struct pcmcia_socket *s,
 		}
 	}
 
-	dev_dbg(&s->dev, "cs: memory probe 0x%06lx-0x%06lx: %p %p %u %u %u",
+	dev_dbg(&s->dev, "cs: memory probe 0x%06lx-0x%06lx: %pr %pr %u %u %u",
 		base, base+size-1, res1, res2, ret, info1, info2);
 
 	free_region(res2);
-- 
2.16.1

[RFC PATCH 3/3] pcmcia: soc_common: Handle return value of clk_prepare_enable

[Dominik Brodowski]

From: Arvind Yadav <arvind.yadav.cs@gmail.com>

clk_prepare_enable() can fail here and we must check its return value.

Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
CC: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
---
 drivers/pcmcia/soc_common.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/pcmcia/soc_common.c b/drivers/pcmcia/soc_common.c
index 764650eb8897..c5f2344c189b 100644
--- a/drivers/pcmcia/soc_common.c
+++ b/drivers/pcmcia/soc_common.c
@@ -191,12 +191,16 @@ static int soc_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
 {
 	int ret = 0, i;
 
-	clk_prepare_enable(skt->clk);
+	ret = clk_prepare_enable(skt->clk);
+	if (ret)
+		return ret;
 
 	if (skt->ops->hw_init) {
 		ret = skt->ops->hw_init(skt);
-		if (ret)
+		if (ret) {
+			clk_disable_unprepare(skt->clk);
 			return ret;
+		}
 	}
 
 	for (i = 0; i < ARRAY_SIZE(skt->stat); i++) {
-- 
2.16.1