Merge tag 'v3.12-rc4' into next

Merge with mainline to bring in changes to input subsystem that were
committed through other trees.

3 files changed, 12 insertions, 11 deletions

diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig
index a5f342e7ea91..296cb88d7008 100644
--- a/drivers/input/serio/Kconfig
+++ b/drivers/input/serio/Kconfig
@@ -239,7 +239,6 @@ config SERIO_PS2MULT
 
 config SERIO_ARC_PS2
         tristate "ARC PS/2 support"
-        depends on GENERIC_HARDIRQS
         help
           Say Y here if you have an ARC FPGA platform with a PS/2
           controller in it.
diff --git a/drivers/input/serio/altera_ps2.c b/drivers/input/serio/altera_ps2.c
index a0a2657e31ff..4777a73cd390 100644
--- a/drivers/input/serio/altera_ps2.c
+++ b/drivers/input/serio/altera_ps2.c
@@ -176,6 +176,7 @@ static int altera_ps2_remove(struct platform_device *pdev)
 #ifdef CONFIG_OF
 static const struct of_device_id altera_ps2_match[] = {
         { .compatible = "ALTR,ps2-1.0", },
+        { .compatible = "altr,ps2-1.0", },
         {},
 };
 MODULE_DEVICE_TABLE(of, altera_ps2_match);
diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
index 25fc5971f426..2b56855c2c77 100644
--- a/drivers/input/serio/serio.c
+++ b/drivers/input/serio/serio.c
@@ -732,19 +732,20 @@ EXPORT_SYMBOL(serio_unregister_child_port);
  * Serio driver operations
  */
 
-static ssize_t serio_driver_show_description(struct device_driver *drv, char *buf)
+static ssize_t description_show(struct device_driver *drv, char *buf)
 {
         struct serio_driver *driver = to_serio_driver(drv);
         return sprintf(buf, "%s\n", driver->description ? driver->description : "(none)");
 }
+static DRIVER_ATTR_RO(description);
 
-static ssize_t serio_driver_show_bind_mode(struct device_driver *drv, char *buf)
+static ssize_t bind_mode_show(struct device_driver *drv, char *buf)
 {
         struct serio_driver *serio_drv = to_serio_driver(drv);
         return sprintf(buf, "%s\n", serio_drv->manual_bind ? "manual" : "auto");
 }
 
-static ssize_t serio_driver_set_bind_mode(struct device_driver *drv, const char *buf, size_t count)
+static ssize_t bind_mode_store(struct device_driver *drv, const char *buf, size_t count)
 {
         struct serio_driver *serio_drv = to_serio_driver(drv);
         int retval;
@@ -760,14 +761,14 @@ static ssize_t serio_driver_set_bind_mode(struct device_driver *drv, const char
 
         return retval;
 }
+static DRIVER_ATTR_RW(bind_mode);
 
-
-static struct driver_attribute serio_driver_attrs[] = {
-        __ATTR(description, S_IRUGO, serio_driver_show_description, NULL),
-        __ATTR(bind_mode, S_IWUSR | S_IRUGO,
-                serio_driver_show_bind_mode, serio_driver_set_bind_mode),
-        __ATTR_NULL
+static struct attribute *serio_driver_attrs[] = {
+        &driver_attr_description.attr,
+        &driver_attr_bind_mode.attr,
+        NULL,
 };
+ATTRIBUTE_GROUPS(serio_driver);
 
 static int serio_driver_probe(struct device *dev)
 {
@@ -996,7 +997,7 @@ EXPORT_SYMBOL(serio_interrupt);
 static struct bus_type serio_bus = {
         .name           = "serio",
         .dev_attrs      = serio_device_attrs,
-        .drv_attrs      = serio_driver_attrs,
+        .drv_groups     = serio_driver_groups,
         .match          = serio_bus_match,
         .uevent         = serio_uevent,
         .probe          = serio_driver_probe,