瀏覽代碼

w1: mxc_w1: move probe() and remove() to the dev* text area

This fixes the section mismatch warning for mxc_w1_probe()

Cc: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Alberto Panizzo 15 年之前
父節點
當前提交
582ef52a5d
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      drivers/w1/masters/mxc_w1.c

+ 2 - 2
drivers/w1/masters/mxc_w1.c

@@ -102,7 +102,7 @@ static u8 mxc_w1_ds2_touch_bit(void *data, u8 bit)
 	return ((__raw_readb(ctrl_addr)) >> 3) & 0x1;
 	return ((__raw_readb(ctrl_addr)) >> 3) & 0x1;
 }
 }
 
 
-static int __init mxc_w1_probe(struct platform_device *pdev)
+static int __devinit mxc_w1_probe(struct platform_device *pdev)
 {
 {
 	struct mxc_w1_device *mdev;
 	struct mxc_w1_device *mdev;
 	struct resource *res;
 	struct resource *res;
@@ -166,7 +166,7 @@ failed_clk:
 /*
 /*
  * disassociate the w1 device from the driver
  * disassociate the w1 device from the driver
  */
  */
-static int mxc_w1_remove(struct platform_device *pdev)
+static int __devexit mxc_w1_remove(struct platform_device *pdev)
 {
 {
 	struct mxc_w1_device *mdev = platform_get_drvdata(pdev);
 	struct mxc_w1_device *mdev = platform_get_drvdata(pdev);
 	struct resource *res;
 	struct resource *res;