summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAlexander Shiyan <shc_work@mail.ru>2013-06-29 06:27:52 +0200
committerShawn Guo <shawn.guo@linaro.org>2013-08-16 06:59:43 +0200
commit29e54970c2681ad621d13df739d0cddf052acf9d (patch)
tree6cce0c0ec5e4da86f5d16b5464e71d8383cdb61e /drivers
parentdrivers: bus: imx-weim: Simplify error path (diff)
downloadlinux-29e54970c2681ad621d13df739d0cddf052acf9d.tar.xz
linux-29e54970c2681ad621d13df739d0cddf052acf9d.zip
drivers: bus: imx-weim: use module_platform_driver_probe()
Driver should be called only once at startup, so code converted to using module_platform_driver_probe(). Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/bus/imx-weim.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/bus/imx-weim.c b/drivers/bus/imx-weim.c
index 0f4b08112afb..f8729247e48e 100644
--- a/drivers/bus/imx-weim.c
+++ b/drivers/bus/imx-weim.c
@@ -22,7 +22,7 @@ MODULE_DEVICE_TABLE(of, weim_id_table);
#define CS_REG_RANGE 0x18
/* Parse and set the timing for this device. */
-static int weim_timing_setup(struct device_node *np, void __iomem *base)
+static int __init weim_timing_setup(struct device_node *np, void __iomem *base)
{
u32 value[CS_TIMING_LEN];
u32 cs_idx;
@@ -49,7 +49,8 @@ static int weim_timing_setup(struct device_node *np, void __iomem *base)
return 0;
}
-static int weim_parse_dt(struct platform_device *pdev, void __iomem *base)
+static int __init weim_parse_dt(struct platform_device *pdev,
+ void __iomem *base)
{
struct device_node *child;
int ret;
@@ -73,7 +74,7 @@ static int weim_parse_dt(struct platform_device *pdev, void __iomem *base)
return ret;
}
-static int weim_probe(struct platform_device *pdev)
+static int __init weim_probe(struct platform_device *pdev)
{
struct resource *res;
struct clk *clk;
@@ -110,10 +111,9 @@ static struct platform_driver weim_driver = {
.name = "imx-weim",
.of_match_table = weim_id_table,
},
- .probe = weim_probe,
};
+module_platform_driver_probe(weim_driver, weim_probe);
-module_platform_driver(weim_driver);
MODULE_AUTHOR("Freescale Semiconductor Inc.");
MODULE_DESCRIPTION("i.MX EIM Controller Driver");
MODULE_LICENSE("GPL");