Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a96b9121 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Greg Kroah-Hartman
Browse files

w1: move omap_hdq's probe function to .devinit.text 



A pointer to omap_hdq_probe is passed to the core via
platform_driver_register and so the function must not disappear when the
.init sections are discarded.  Otherwise (if also having HOTPLUG=y)
unbinding and binding a device to the driver via sysfs will result in an
oops as does a device being registered late.

An alternative to this patch is using platform_driver_probe instead of
platform_driver_register plus removing the pointer to the probe function
from the struct platform_driver.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Stanley.Miao <stanley.miao@windriver.com>
Acked-by: default avatarEvgeniy Polyakov <zbr@ioremap.net>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Madhusudhan Chikkature <madhu.cr@ti.com>
Cc: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 1139aea9

drivers/w1/masters/omap_hdq.c

+2 −2
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ struct hdq_data { 
	int			init_trans;

};



static int __init omap_hdq_probe(struct platform_device *pdev);

static int __devinit omap_hdq_probe(struct platform_device *pdev);

static int omap_hdq_remove(struct platform_device *pdev);



static struct platform_driver omap_hdq_driver = {
@@ -558,7 +558,7 @@ static void omap_w1_write_byte(void *_hdq, u8 byte) 
	return;

}



static int __init omap_hdq_probe(struct platform_device *pdev)

static int __devinit omap_hdq_probe(struct platform_device *pdev)

{

	struct hdq_data *hdq_data;

	struct resource *res;