Merge branch 'clocksource/cleanup' into next/cleanup

Clockevent cleanup series from Shawn Guo.

Resolved move/change conflict in mach-pxa/time.c due to the sys_timer
cleanup.

* clocksource/cleanup:
  clocksource: use clockevents_config_and_register() where possible
  ARM: use clockevents_config_and_register() where possible
  clockevents: export clockevents_config_and_register for module use
  + sync to Linux 3.8-rc3

Signed-off-by: Olof Johansson <olof@lixom.net>

Conflicts:
	arch/arm/mach-pxa/time.c

1 files changed, 12 insertions, 1 deletions

diff --git a/drivers/input/keyboard/gpio_keys_polled.c b/drivers/input/keyboard/gpio_keys_polled.c
index f686fd970553..21147164874d 100644
--- a/drivers/input/keyboard/gpio_keys_polled.c
+++ b/drivers/input/keyboard/gpio_keys_polled.c
@@ -135,6 +135,7 @@ static struct gpio_keys_platform_data *gpio_keys_polled_get_devtree_pdata(struct
 
         i = 0;
         for_each_child_of_node(node, pp) {
+                int gpio;
                 enum of_gpio_flags flags;
 
                 if (!of_find_property(pp, "gpios", NULL)) {
@@ -143,9 +144,19 @@ static struct gpio_keys_platform_data *gpio_keys_polled_get_devtree_pdata(struct
                         continue;
                 }
 
+                gpio = of_get_gpio_flags(pp, 0, &flags);
+                if (gpio < 0) {
+                        error = gpio;
+                        if (error != -EPROBE_DEFER)
+                                dev_err(dev,
+                                        "Failed to get gpio flags, error: %d\n",
+                                        error);
+                        goto err_free_pdata;
+                }
+
                 button = &pdata->buttons[i++];
 
-                button->gpio = of_get_gpio_flags(pp, 0, &flags);
+                button->gpio = gpio;
                 button->active_low = flags & OF_GPIO_ACTIVE_LOW;
 
                 if (of_property_read_u32(pp, "linux,code", &button->code)) {