From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 4 Jan 2013 00:17:50 +0000 (-0800)
Subject: Merge tag 'driver-core-3.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=49569646b2413ee1a4fb7c4537fca058ac22292e;p=linux-beck.git

Merge tag 'driver-core-3.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

Pull driver core __dev* removal patches - take 3 - from Greg Kroah-Hartman:
 "Here are the remaining __dev* removal patches against the 3.8-rc2
  tree.  All of these patches were previously sent to the subsystem
  maintainers, most of them were picked up and pushed to you, but there
  were a number that fell through the cracks, and new drivers were added
  during the merge window, so this series cleans up the rest of the
  instances of these markings.

  Third time's the charm...

  Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"

Fixed up trivial conflict with the pinctrl pull in pinctrl-sirf.c.

* tag 'driver-core-3.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (54 commits)
  misc: remove __dev* attributes.
  include: remove __dev* attributes.
  Documentation: remove __dev* attributes.
  Drivers: misc: remove __dev* attributes.
  Drivers: block: remove __dev* attributes.
  Drivers: bcma: remove __dev* attributes.
  Drivers: char: remove __dev* attributes.
  Drivers: clocksource: remove __dev* attributes.
  Drivers: ssb: remove __dev* attributes.
  Drivers: dma: remove __dev* attributes.
  Drivers: gpu: remove __dev* attributes.
  Drivers: infinband: remove __dev* attributes.
  Drivers: memory: remove __dev* attributes.
  Drivers: mmc: remove __dev* attributes.
  Drivers: iommu: remove __dev* attributes.
  Drivers: power: remove __dev* attributes.
  Drivers: message: remove __dev* attributes.
  Drivers: macintosh: remove __dev* attributes.
  Drivers: mfd: remove __dev* attributes.
  pstore: remove __dev* attributes.
  ...
---

49569646b2413ee1a4fb7c4537fca058ac22292e
diff --cc drivers/pinctrl/pinctrl-sirf.c
index 30e1a38293a0,c776046f7cb8..498b2ba905de
--- a/drivers/pinctrl/pinctrl-sirf.c
+++ b/drivers/pinctrl/pinctrl-sirf.c
@@@ -1663,45 -1663,7 +1663,45 @@@ const struct irq_domain_ops sirfsoc_gpi
  	.xlate = irq_domain_xlate_twocell,
  };
  
 +static void sirfsoc_gpio_set_pullup(const u32 *pullups)
 +{
 +	int i, n;
 +	const unsigned long *p = (const unsigned long *)pullups;
 +
 +	for (i = 0; i < SIRFSOC_GPIO_NO_OF_BANKS; i++) {
 +		n = find_first_bit(p + i, BITS_PER_LONG);
 +		while (n < BITS_PER_LONG) {
 +			u32 offset = SIRFSOC_GPIO_CTRL(i, n);
 +			u32 val = readl(sgpio_bank[i].chip.regs + offset);
 +			val |= SIRFSOC_GPIO_CTL_PULL_MASK;
 +			val |= SIRFSOC_GPIO_CTL_PULL_HIGH;
 +			writel(val, sgpio_bank[i].chip.regs + offset);
 +
 +			n = find_next_bit(p + i, BITS_PER_LONG, n + 1);
 +		}
 +	}
 +}
 +
 +static void sirfsoc_gpio_set_pulldown(const u32 *pulldowns)
 +{
 +	int i, n;
 +	const unsigned long *p = (const unsigned long *)pulldowns;
 +
 +	for (i = 0; i < SIRFSOC_GPIO_NO_OF_BANKS; i++) {
 +		n = find_first_bit(p + i, BITS_PER_LONG);
 +		while (n < BITS_PER_LONG) {
 +			u32 offset = SIRFSOC_GPIO_CTRL(i, n);
 +			u32 val = readl(sgpio_bank[i].chip.regs + offset);
 +			val |= SIRFSOC_GPIO_CTL_PULL_MASK;
 +			val &= ~SIRFSOC_GPIO_CTL_PULL_HIGH;
 +			writel(val, sgpio_bank[i].chip.regs + offset);
 +
 +			n = find_next_bit(p + i, BITS_PER_LONG, n + 1);
 +		}
 +	}
 +}
 +
- static int __devinit sirfsoc_gpio_probe(struct device_node *np)
+ static int sirfsoc_gpio_probe(struct device_node *np)
  {
  	int i, err = 0;
  	struct sirfsoc_gpio_bank *bank;