From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 9 Jan 2013 02:53:56 +0000 (-0800)
Subject: Merge tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=974b33586b4bbbdab33c666417f9ba9ef50b62c3;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'fixes' of git://git./linux/kernel/git/arm/arm-soc

Pull ARM SoC fixes from Olof Johansson:
 "People are back from the holiday breaks, and it shows.  Here are a
  bunch of fixes for a number of platforms:
   - A couple of small fixes for Nomadik
   - A larger set of changes for kirkwood/mvebu
     - uart driver selection, dt clocks, gpio-poweroff fixups, a few
       __init annotation fixes and some error handling improvement in
       their xor dma driver.
   - i.MX had a couple of minor fixes (and a critical one for flexcan2
     clock setup)
   - MXS has a small board fix and a framebuffer bugfix
   - A set of fixes for Samsung Exynos, fixing default bootargs and some
     Exynos5440 clock issues
   - A set of OMAP changes including PM fixes and a few sparse warning
     fixups

  All in all a bit more positive code delta than we'd ideally want to
  see here, mostly from the OMAP PM changes, but nothing overly crazy."

* tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (44 commits)
  ARM: clps711x: Fix bad merge of clockevents setup
  ARM: highbank: save and restore L2 cache and GIC on suspend
  ARM: highbank: add a power request clear
  ARM: highbank: fix secondary boot and hotplug
  ARM: highbank: fix typos with hignbank in power request functions
  ARM: dts: fix highbank cpu mpidr values
  ARM: dts: add device_type prop to cpu nodes on Calxeda platforms
  ARM: mx5: Fix MX53 flexcan2 clock
  ARM: OMAP2+: am33xx-hwmod: Fix wrongly terminated am33xx_usbss_mpu_irqs array
  pinctrl: mvebu: make pdma clock on dove mandatory
  ARM: Dove: Add pinctrl clock to DT
  dma: mv_xor: fix error handling for clocks
  dma: mv_xor: fix error handling of mv_xor_channel_add()
  arm: mvebu: Add missing ; for cpu node.
  arm: mvebu: Armada XP MV78230 has only three Ethernet interfaces
  arm: mvebu: Armada XP MV78230 has two cores, not one
  clk: mvebu: Remove inappropriate __init tagging
  ARM: Kirkwood: Use fixed-regulator instead of board gpio call
  ARM: Kirkwood: Fix missing sdio clock
  ARM: Kirkwood: Switch TWSI1 of 88f6282 to DT clock providers
  ...
---

974b33586b4bbbdab33c666417f9ba9ef50b62c3
diff --cc drivers/power/reset/gpio-poweroff.c
index 06074248ba7a,adc943b3fc3f..e290d48ddd99
--- a/drivers/power/reset/gpio-poweroff.c
+++ b/drivers/power/reset/gpio-poweroff.c
@@@ -96,10 -94,9 +94,9 @@@ err
  	return -ENODEV;
  }
  
 -static int __devexit gpio_poweroff_remove(struct platform_device *pdev)
 +static int gpio_poweroff_remove(struct platform_device *pdev)
  {
- 	if (gpio_num != -1)
- 		gpio_free(gpio_num);
+ 	gpio_free(gpio_num);
  	if (pm_power_off == &gpio_poweroff_do_poweroff)
  		pm_power_off = NULL;
  
@@@ -113,12 -110,12 +110,12 @@@ static const struct of_device_id of_gpi
  
  static struct platform_driver gpio_poweroff_driver = {
  	.probe = gpio_poweroff_probe,
 -	.remove = __devexit_p(gpio_poweroff_remove),
 +	.remove = gpio_poweroff_remove,
  	.driver = {
- 		   .name = "poweroff-gpio",
- 		   .owner = THIS_MODULE,
- 		   .of_match_table = of_gpio_poweroff_match,
- 		   },
+ 		.name = "poweroff-gpio",
+ 		.owner = THIS_MODULE,
+ 		.of_match_table = of_gpio_poweroff_match,
+ 	},
  };
  
  module_platform_driver(gpio_poweroff_driver);