From: Alexander Shiyan <shc_work@mail.ru>
Date: Fri, 7 Feb 2014 14:16:05 +0000 (+0400)
Subject: serial: max310x: Remove init() and exit() callbacks
X-Git-Tag: v3.15-rc1~138^2~66
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e6128b63597adf97f1865fba7d778a6f8ccb7a0;p=pandora-kernel.git

serial: max310x: Remove init() and exit() callbacks

These callbacks were previously used for the IC power initialization.
If this initialization will be needed in the future, it should be
implemented with the regulator API.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/tty/serial/max310x.c b/drivers/tty/serial/max310x.c
index 313bdf0bb21b..202c1fb6542d 100644
--- a/drivers/tty/serial/max310x.c
+++ b/drivers/tty/serial/max310x.c
@@ -1135,10 +1135,6 @@ static int max310x_probe(struct device *dev, int is_spi,
 		return PTR_ERR(s->regmap);
 	}
 
-	/* Board specific configure */
-	if (s->pdata->init)
-		s->pdata->init();
-
 	/* Check device to ensure we are talking to what we expect */
 	ret = devtype->detect(dev);
 	if (ret)
@@ -1265,9 +1261,6 @@ static int max310x_remove(struct device *dev)
 		ret = gpiochip_remove(&s->gpio);
 #endif
 
-	if (s->pdata->exit)
-		s->pdata->exit();
-
 	return ret;
 }
 
diff --git a/include/linux/platform_data/max310x.h b/include/linux/platform_data/max310x.h
index dd11dcd1a184..5f4b35d99c2e 100644
--- a/include/linux/platform_data/max310x.h
+++ b/include/linux/platform_data/max310x.h
@@ -55,10 +55,6 @@ struct max310x_pdata {
 	const int		frequency;
 	/* GPIO base number (can be negative) */
 	const int		gpio_base;
-	/* Called during startup */
-	void (*init)(void);
-	/* Called before finish */
-	void (*exit)(void);
 };
 
 #endif