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

Commit 9e1a0aab authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'char-misc-3.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc 

Pull char/misc fixes from Greg Kroah-Hartman:
 "Here are some tiny fixes for the w1 drivers and the final removal
  patch for getting rid of CONFIG_EXPERIMENTAL (all users of it are now
  gone from your tree, this just drops the Kconfig item itself.)

  All have been in the linux-next tree for a while"

* tag 'char-misc-3.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  final removal of CONFIG_EXPERIMENTAL
  w1: fix oops when w1_search is called from netlink connector
  w1-gpio: fix unused variable warning
  w1-gpio: remove erroneous __exit and __exit_p()
  ARM: w1-gpio: fix erroneous gpio requests
parents 5cd8846c 3d374d09

arch/arm/mach-at91/board-foxg20.c

+1 −0
Original line number Diff line number Diff line
@@ -176,6 +176,7 @@ static struct w1_gpio_platform_data w1_gpio_pdata = { 
	/* If you choose to use a pin other than PB16 it needs to be 3.3V */

	.pin		= AT91_PIN_PB16,

	.is_open_drain  = 1,

	.ext_pullup_enable_pin	= -EINVAL,

};



static struct platform_device w1_device = {

arch/arm/mach-at91/board-stamp9g20.c

+1 −0
Original line number Diff line number Diff line
@@ -188,6 +188,7 @@ static struct spi_board_info portuxg20_spi_devices[] = { 
static struct w1_gpio_platform_data w1_gpio_pdata = {

	.pin		= AT91_PIN_PA29,

	.is_open_drain	= 1,

	.ext_pullup_enable_pin	= -EINVAL,

};



static struct platform_device w1_device = {

arch/arm/mach-ixp4xx/vulcan-setup.c

+1 −0
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ static struct platform_device vulcan_max6369 = { 


static struct w1_gpio_platform_data vulcan_w1_gpio_pdata = {

	.pin			= 14,

	.ext_pullup_enable_pin	= -EINVAL,

};



static struct platform_device vulcan_w1_gpio = {

arch/arm/mach-pxa/raumfeld.c

+1 −0
Original line number Diff line number Diff line
@@ -505,6 +505,7 @@ static struct w1_gpio_platform_data w1_gpio_platform_data = { 
	.pin			= GPIO_ONE_WIRE,

	.is_open_drain		= 0,

	.enable_external_pullup	= w1_enable_external_pullup,

	.ext_pullup_enable_pin	= -EINVAL,

};



struct platform_device raumfeld_w1_gpio_device = {

drivers/w1/masters/w1-gpio.c

+4 −2
Original line number Diff line number Diff line
@@ -47,11 +47,13 @@ static u8 w1_gpio_read_bit(void *data) 
	return gpio_get_value(pdata->pin) ? 1 : 0;

}



#if defined(CONFIG_OF)

static struct of_device_id w1_gpio_dt_ids[] = {

	{ .compatible = "w1-gpio" },

	{}

};

MODULE_DEVICE_TABLE(of, w1_gpio_dt_ids);

#endif



static int w1_gpio_probe_dt(struct platform_device *pdev)

{
@@ -158,7 +160,7 @@ static int w1_gpio_probe(struct platform_device *pdev) 
	return err;

}



static int __exit w1_gpio_remove(struct platform_device *pdev)

static int w1_gpio_remove(struct platform_device *pdev)

{

	struct w1_bus_master *master = platform_get_drvdata(pdev);

	struct w1_gpio_platform_data *pdata = pdev->dev.platform_data;
@@ -210,7 +212,7 @@ static struct platform_driver w1_gpio_driver = { 
		.of_match_table = of_match_ptr(w1_gpio_dt_ids),

	},

	.probe = w1_gpio_probe,

	.remove	= __exit_p(w1_gpio_remove),

	.remove	= w1_gpio_remove,

	.suspend = w1_gpio_suspend,

	.resume = w1_gpio_resume,

};