194 files changed, 3705 insertions, 1841 deletions
diff --git a/drivers/acpi/acpica/accommon.h b/drivers/acpi/acpica/accommon.h
index 3b20786cbb0..3e50c74ed4a 100644
--- a/drivers/acpi/acpica/accommon.h
+++ b/drivers/acpi/acpica/accommon.h
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/acconfig.h b/drivers/acpi/acpica/acconfig.h
index a4471e3d385..33181ad350d 100644
--- a/drivers/acpi/acpica/acconfig.h
+++ b/drivers/acpi/acpica/acconfig.h
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/acdebug.h b/drivers/acpi/acpica/acdebug.h
index a4fb001d96f..48faf3eba9f 100644
--- a/drivers/acpi/acpica/acdebug.h
+++ b/drivers/acpi/acpica/acdebug.h
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/acdispat.h b/drivers/acpi/acpica/acdispat.h
index 6291904be01..894a0ff2a94 100644
--- a/drivers/acpi/acpica/acdispat.h
+++ b/drivers/acpi/acpica/acdispat.h
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/acevents.h b/drivers/acpi/acpica/acevents.h
index 4ced54f7a5d..3e6ba99e405 100644
--- a/drivers/acpi/acpica/acevents.h
+++ b/drivers/acpi/acpica/acevents.h
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -133,8 +133,7 @@ acpi_status acpi_ev_initialize_op_regions(void);
 acpi_status
 acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
                               u32 function,
-                               u32 region_offset,
+                               u32 region_offset, u32 bit_width, u64 *value);
-                               u32 bit_width, acpi_integer * value);
 acpi_status
 acpi_ev_attach_region(union acpi_operand_object *handler_obj,
diff --git a/drivers/acpi/acpica/acglobal.h b/drivers/acpi/acpica/acglobal.h
index 29ba66d5a79..f8dd8f250ac 100644
--- a/drivers/acpi/acpica/acglobal.h
+++ b/drivers/acpi/acpica/acglobal.h
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/achware.h b/drivers/acpi/acpica/achware.h
index 36192f142fb..5900f135dc6 100644
--- a/drivers/acpi/acpica/achware.h
+++ b/drivers/acpi/acpica/achware.h
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/acinterp.h b/drivers/acpi/acpica/acinterp.h
index 5db9f2916f7..6df3f842816 100644
--- a/drivers/acpi/acpica/acinterp.h
+++ b/drivers/acpi/acpica/acinterp.h
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -129,18 +129,17 @@ acpi_ex_common_buffer_setup(union acpi_operand_object *obj_desc,
 acpi_status
 acpi_ex_write_with_update_rule(union acpi_operand_object *obj_desc,
-                               acpi_integer mask,
+                               u64 mask,
-                               acpi_integer field_value,
+                               u64 field_value, u32 field_datum_byte_offset);
-                               u32 field_datum_byte_offset);
 void
-acpi_ex_get_buffer_datum(acpi_integer * datum,
+acpi_ex_get_buffer_datum(u64 *datum,
                         void *buffer,
                         u32 buffer_length,
                         u32 byte_granularity, u32 buffer_offset);
 void
-acpi_ex_set_buffer_datum(acpi_integer merged_datum,
+acpi_ex_set_buffer_datum(u64 merged_datum,
                         void *buffer,
                         u32 buffer_length,
                         u32 byte_granularity, u32 buffer_offset);
@@ -168,8 +167,7 @@ acpi_ex_insert_into_field(union acpi_operand_object *obj_desc,
 acpi_status
 acpi_ex_access_region(union acpi_operand_object *obj_desc,
-                      u32 field_datum_byte_offset,
+                      u32 field_datum_byte_offset, u64 *value, u32 read_write);
-                      acpi_integer * value, u32 read_write);
 /*
 * exmisc - misc support routines
@@ -193,16 +191,14 @@ acpi_ex_do_concatenate(union acpi_operand_object *obj_desc,
 acpi_status
 acpi_ex_do_logical_numeric_op(u16 opcode,
-                              acpi_integer integer0,
+                              u64 integer0, u64 integer1, u8 *logical_result);
-                              acpi_integer integer1, u8 * logical_result);
 acpi_status
 acpi_ex_do_logical_op(u16 opcode,
                      union acpi_operand_object *operand0,
-                      union acpi_operand_object *operand1, u8 * logical_result);
+                      union acpi_operand_object *operand1, u8 *logical_result);
-acpi_integer
+u64 acpi_ex_do_math_op(u16 opcode, u64 operand0, u64 operand1);
-acpi_ex_do_math_op(u16 opcode, acpi_integer operand0, acpi_integer operand1);
 acpi_status acpi_ex_create_mutex(struct acpi_walk_state *walk_state);
@@ -278,7 +274,7 @@ acpi_status
 acpi_ex_system_do_notify_op(union acpi_operand_object *value,
                            union acpi_operand_object *obj_desc);
-acpi_status acpi_ex_system_do_suspend(acpi_integer time);
+acpi_status acpi_ex_system_do_suspend(u64 time);
 acpi_status acpi_ex_system_do_stall(u32 time);
@@ -461,9 +457,9 @@ void acpi_ex_acquire_global_lock(u32 rule);
 void acpi_ex_release_global_lock(u32 rule);
-void acpi_ex_eisa_id_to_string(char *dest, acpi_integer compressed_id);
+void acpi_ex_eisa_id_to_string(char *dest, u64 compressed_id);
-void acpi_ex_integer_to_string(char *dest, acpi_integer value);
+void acpi_ex_integer_to_string(char *dest, u64 value);
 /*
 * exregion - default op_region handlers
@@ -472,7 +468,7 @@ acpi_status
 acpi_ex_system_memory_space_handler(u32 function,
                                    acpi_physical_address address,
                                    u32 bit_width,
-                                    acpi_integer * value,
+                                    u64 *value,
                                    void *handler_context,
                                    void *region_context);
@@ -480,35 +476,35 @@ acpi_status
 acpi_ex_system_io_space_handler(u32 function,
                                acpi_physical_address address,
                                u32 bit_width,
-                                acpi_integer * value,
+                                u64 *value,
                                void *handler_context, void *region_context);
 acpi_status
 acpi_ex_pci_config_space_handler(u32 function,
                                 acpi_physical_address address,
                                 u32 bit_width,
-                                 acpi_integer * value,
+                                 u64 *value,
                                 void *handler_context, void *region_context);
 acpi_status
 acpi_ex_cmos_space_handler(u32 function,
                           acpi_physical_address address,
                           u32 bit_width,
-                           acpi_integer * value,
+                           u64 *value,
                           void *handler_context, void *region_context);
 acpi_status
 acpi_ex_pci_bar_space_handler(u32 function,
                              acpi_physical_address address,
                              u32 bit_width,
-                              acpi_integer * value,
+                              u64 *value,
                              void *handler_context, void *region_context);
 acpi_status
 acpi_ex_embedded_controller_space_handler(u32 function,
                                          acpi_physical_address address,
                                          u32 bit_width,
-                                          acpi_integer * value,
+                                          u64 *value,
                                          void *handler_context,
                                          void *region_context);
@@ -516,14 +512,14 @@ acpi_status
 acpi_ex_sm_bus_space_handler(u32 function,
                             acpi_physical_address address,
                             u32 bit_width,
-                             acpi_integer * value,
+                             u64 *value,
                             void *handler_context, void *region_context);
 acpi_status
 acpi_ex_data_table_space_handler(u32 function,
                                 acpi_physical_address address,
                                 u32 bit_width,
-                                 acpi_integer * value,
+                                 u64 *value,
                                 void *handler_context, void *region_context);
 #endif                          /* __INTERP_H__ */
diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h
index 13cb80caacd..24b8faa5c39 100644
--- a/drivers/acpi/acpica/aclocal.h
+++ b/drivers/acpi/acpica/aclocal.h
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -374,6 +374,7 @@ union acpi_predefined_info {
 struct acpi_predefined_data {
        char *pathname;
        const union acpi_predefined_info *predefined;
+        union acpi_operand_object *parent_package;
        u32 flags;
        u8 node_flags;
 };
@@ -651,8 +652,7 @@ struct acpi_opcode_info {
 };
 union acpi_parse_value {
-        acpi_integer integer;   /* Integer constant (Up to 64 bits) */
+        u64 integer;            /* Integer constant (Up to 64 bits) */
-        struct uint64_struct integer64; /* Structure overlay for 2 32-bit Dwords */
        u32 size;               /* bytelist or field size */
        char *string;           /* NULL terminated string */
        u8 *buffer;             /* buffer or string */
diff --git a/drivers/acpi/acpica/acmacros.h b/drivers/acpi/acpica/acmacros.h
index 7d9ba6e5755..9894929a2ab 100644
--- a/drivers/acpi/acpica/acmacros.h
+++ b/drivers/acpi/acpica/acmacros.h
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -272,8 +272,8 @@
 * MASK_BITS_ABOVE creates a mask starting AT the position and above
 * MASK_BITS_BELOW creates a mask starting one bit BELOW the position
 */
-#define ACPI_MASK_BITS_ABOVE(position)      (~((ACPI_INTEGER_MAX) << ((u32) (position))))
+#define ACPI_MASK_BITS_ABOVE(position)      (~((ACPI_UINT64_MAX) << ((u32) (position))))
-#define ACPI_MASK_BITS_BELOW(position)      ((ACPI_INTEGER_MAX) << ((u32) (position)))
+#define ACPI_MASK_BITS_BELOW(position)      ((ACPI_UINT64_MAX) << ((u32) (position)))
 /* Bitfields within ACPI registers */
@@ -414,16 +414,16 @@
                                                                                        acpi_ut_ptr_exit (ACPI_DEBUG_PARAMETERS, (u8 *) _s); \
                                                                                        return (_s); })
 #define return_VALUE(s)                 ACPI_DO_WHILE0 ({ \
-                                                                                        register acpi_integer _s = (s); \
+                                                                                        register u64 _s = (s); \
                                                                                        acpi_ut_value_exit (ACPI_DEBUG_PARAMETERS, _s); \
                                                                                        return (_s); })
 #define return_UINT8(s)                 ACPI_DO_WHILE0 ({ \
                                                                                        register u8 _s = (u8) (s); \
-                                                                                        acpi_ut_value_exit (ACPI_DEBUG_PARAMETERS, (acpi_integer) _s); \
+                                                                                        acpi_ut_value_exit (ACPI_DEBUG_PARAMETERS, (u64) _s); \
                                                                                        return (_s); })
 #define return_UINT32(s)                ACPI_DO_WHILE0 ({ \
                                                                                        register u32 _s = (u32) (s); \
-                                                                                        acpi_ut_value_exit (ACPI_DEBUG_PARAMETERS, (acpi_integer) _s); \
+                                                                                        acpi_ut_value_exit (ACPI_DEBUG_PARAMETERS, (u64) _s); \
                                                                                        return (_s); })
 #else                           /* Use original less-safe macros */
@@ -434,7 +434,7 @@
                                                                                        acpi_ut_ptr_exit (ACPI_DEBUG_PARAMETERS, (u8 *) (s)); \
                                                                                        return((s)); })
 #define return_VALUE(s)                 ACPI_DO_WHILE0 ({ \
-                                                                                        acpi_ut_value_exit (ACPI_DEBUG_PARAMETERS, (acpi_integer) (s)); \
+                                                                                        acpi_ut_value_exit (ACPI_DEBUG_PARAMETERS, (u64) (s)); \
                                                                                        return((s)); })
 #define return_UINT8(s)                 return_VALUE(s)
 #define return_UINT32(s)                return_VALUE(s)
diff --git a/drivers/acpi/acpica/acnamesp.h b/drivers/acpi/acpica/acnamesp.h
index 61edb156e8d..258159cfcdf 100644
--- a/drivers/acpi/acpica/acnamesp.h
+++ b/drivers/acpi/acpica/acnamesp.h
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -286,6 +286,17 @@ acpi_status
 acpi_ns_repair_package_list(struct acpi_predefined_data *data,
                            union acpi_operand_object **obj_desc_ptr);
+acpi_status
+acpi_ns_repair_null_element(struct acpi_predefined_data *data,
+                            u32 expected_btypes,
+                            u32 package_index,
+                            union acpi_operand_object **return_object_ptr);
+void
+acpi_ns_remove_null_elements(struct acpi_predefined_data *data,
+                             u8 package_type,
+                             union acpi_operand_object *obj_desc);
 /*
 * nsrepair2 - Return object repair for specific
 * predefined methods/objects
@@ -296,11 +307,6 @@ acpi_ns_complex_repairs(struct acpi_predefined_data *data,
                        acpi_status validate_status,
                        union acpi_operand_object **return_object_ptr);
-void
-acpi_ns_remove_null_elements(struct acpi_predefined_data *data,
-                             u8 package_type,
-                             union acpi_operand_object *obj_desc);
 /*
 * nssearch - Namespace searching and entry
 */
diff --git a/drivers/acpi/acpica/acobject.h b/drivers/acpi/acpica/acobject.h
index 07f6e2ea2ee..cde18ea8265 100644
--- a/drivers/acpi/acpica/acobject.h
+++ b/drivers/acpi/acpica/acobject.h
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -111,7 +111,7 @@ ACPI_OBJECT_COMMON_HEADER};
 struct acpi_object_integer {
        ACPI_OBJECT_COMMON_HEADER u8 fill[3];   /* Prevent warning on some compilers */
-        acpi_integer value;
+        u64 value;
 };
 /*
diff --git a/drivers/acpi/acpica/acopcode.h b/drivers/acpi/acpica/acopcode.h
index dfdf6332788..8c15ff43f42 100644
--- a/drivers/acpi/acpica/acopcode.h
+++ b/drivers/acpi/acpica/acopcode.h
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/acparser.h b/drivers/acpi/acpica/acparser.h
index 22881e8ce22..d0bb0fd3e57 100644
--- a/drivers/acpi/acpica/acparser.h
+++ b/drivers/acpi/acpica/acparser.h
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/acpredef.h b/drivers/acpi/acpica/acpredef.h
index 57bdaf6ffab..97116082cb6 100644
--- a/drivers/acpi/acpica/acpredef.h
+++ b/drivers/acpi/acpica/acpredef.h
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/acresrc.h b/drivers/acpi/acpica/acresrc.h
index eef5bd7a59f..528bcbaf4ce 100644
--- a/drivers/acpi/acpica/acresrc.h
+++ b/drivers/acpi/acpica/acresrc.h
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/acstruct.h b/drivers/acpi/acpica/acstruct.h
index 7980a26bad3..161bc0e3d70 100644
--- a/drivers/acpi/acpica/acstruct.h
+++ b/drivers/acpi/acpica/acstruct.h
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/actables.h b/drivers/acpi/acpica/actables.h
index 01c76b8ea7b..8ff3b741df2 100644
--- a/drivers/acpi/acpica/actables.h
+++ b/drivers/acpi/acpica/actables.h
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/acutils.h b/drivers/acpi/acpica/acutils.h
index 3a451a21a3f..35df755251c 100644
--- a/drivers/acpi/acpica/acutils.h
+++ b/drivers/acpi/acpica/acutils.h
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -134,7 +134,7 @@ char *acpi_ut_get_region_name(u8 space_id);
 char *acpi_ut_get_event_name(u32 event_id);
-char acpi_ut_hex_to_ascii_char(acpi_integer integer, u32 position);
+char acpi_ut_hex_to_ascii_char(u64 integer, u32 position);
 u8 acpi_ut_valid_object_type(acpi_object_type type);
@@ -279,8 +279,7 @@ acpi_ut_status_exit(u32 line_number,
 void
 acpi_ut_value_exit(u32 line_number,
                   const char *function_name,
-                   const char *module_name,
+                   const char *module_name, u32 component_id, u64 value);
-                   u32 component_id, acpi_integer value);
 void
 acpi_ut_ptr_exit(u32 line_number,
@@ -324,7 +323,7 @@ acpi_ut_evaluate_object(struct acpi_namespace_node *prefix_node,
 acpi_status
 acpi_ut_evaluate_numeric_object(char *object_name,
                                struct acpi_namespace_node *device_node,
-                                acpi_integer *value);
+                                u64 *value);
 acpi_status
 acpi_ut_execute_STA(struct acpi_namespace_node *device_node, u32 *status_flags);
@@ -437,14 +436,12 @@ void acpi_ut_delete_generic_state(union acpi_generic_state *state);
 * utmath
 */
 acpi_status
-acpi_ut_divide(acpi_integer in_dividend,
+acpi_ut_divide(u64 in_dividend,
-               acpi_integer in_divisor,
+               u64 in_divisor, u64 *out_quotient, u64 *out_remainder);
-               acpi_integer * out_quotient, acpi_integer * out_remainder);
 acpi_status
-acpi_ut_short_divide(acpi_integer in_dividend,
+acpi_ut_short_divide(u64 in_dividend,
-                     u32 divisor,
+                     u32 divisor, u64 *out_quotient, u32 *out_remainder);
-                     acpi_integer * out_quotient, u32 * out_remainder);
 /*
 * utmisc
@@ -474,8 +471,7 @@ acpi_name acpi_ut_repair_name(char *name);
 u8 acpi_ut_valid_acpi_char(char character, u32 position);
-acpi_status
+acpi_status acpi_ut_strtoul64(char *string, u32 base, u64 * ret_integer);
-acpi_ut_strtoul64(char *string, u32 base, acpi_integer * ret_integer);
 void ACPI_INTERNAL_VAR_XFACE
 acpi_ut_predefined_warning(const char *module_name,
diff --git a/drivers/acpi/acpica/amlcode.h b/drivers/acpi/acpica/amlcode.h
index 4940249f252..1f484ba228f 100644
--- a/drivers/acpi/acpica/amlcode.h
+++ b/drivers/acpi/acpica/amlcode.h
@@ -7,7 +7,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/amlresrc.h b/drivers/acpi/acpica/amlresrc.h
index 7b070e42b7c..0e5798fcbb1 100644
--- a/drivers/acpi/acpica/amlresrc.h
+++ b/drivers/acpi/acpica/amlresrc.h
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/dsfield.c b/drivers/acpi/acpica/dsfield.c
index 54a225e56a6..bb13817e0c3 100644
--- a/drivers/acpi/acpica/dsfield.c
+++ b/drivers/acpi/acpica/dsfield.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -220,7 +220,7 @@ acpi_ds_get_field_names(struct acpi_create_field_info *info,
                        union acpi_parse_object *arg)
 {
        acpi_status status;
-        acpi_integer position;
+        u64 position;
        ACPI_FUNCTION_TRACE_PTR(ds_get_field_names, info);
@@ -240,8 +240,8 @@ acpi_ds_get_field_names(struct acpi_create_field_info *info,
                switch (arg->common.aml_opcode) {
                case AML_INT_RESERVEDFIELD_OP:
-                        position = (acpi_integer) info->field_bit_position
+                        position = (u64) info->field_bit_position
-                            + (acpi_integer) arg->common.value.size;
+                            + (u64) arg->common.value.size;
                        if (position > ACPI_UINT32_MAX) {
                                ACPI_ERROR((AE_INFO,
@@ -305,8 +305,8 @@ acpi_ds_get_field_names(struct acpi_create_field_info *info,
                        /* Keep track of bit position for the next field */
-                        position = (acpi_integer) info->field_bit_position
+                        position = (u64) info->field_bit_position
-                            + (acpi_integer) arg->common.value.size;
+                            + (u64) arg->common.value.size;
                        if (position > ACPI_UINT32_MAX) {
                                ACPI_ERROR((AE_INFO,
diff --git a/drivers/acpi/acpica/dsinit.c b/drivers/acpi/acpica/dsinit.c
index f23fa0be6fc..abe140318a7 100644
--- a/drivers/acpi/acpica/dsinit.c
+++ b/drivers/acpi/acpica/dsinit.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/dsmethod.c b/drivers/acpi/acpica/dsmethod.c
index e786f9fd767..721039233aa 100644
--- a/drivers/acpi/acpica/dsmethod.c
+++ b/drivers/acpi/acpica/dsmethod.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/dsmthdat.c b/drivers/acpi/acpica/dsmthdat.c
index 0ba19f84ad8..cc343b95954 100644
--- a/drivers/acpi/acpica/dsmthdat.c
+++ b/drivers/acpi/acpica/dsmthdat.c
@@ -5,7 +5,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/dsobject.c b/drivers/acpi/acpica/dsobject.c
index 9bc1ba07634..891e08bf560 100644
--- a/drivers/acpi/acpica/dsobject.c
+++ b/drivers/acpi/acpica/dsobject.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -684,7 +684,7 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state,
                        case AML_ONES_OP:
-                                obj_desc->integer.value = ACPI_INTEGER_MAX;
+                                obj_desc->integer.value = ACPI_UINT64_MAX;
                                /* Truncate value if we are executing from a 32-bit ACPI table */
diff --git a/drivers/acpi/acpica/dsopcode.c b/drivers/acpi/acpica/dsopcode.c
index b79978f7bc7..bf980cadb1e 100644
--- a/drivers/acpi/acpica/dsopcode.c
+++ b/drivers/acpi/acpica/dsopcode.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/dsutils.c b/drivers/acpi/acpica/dsutils.c
index dfa10410292..306c62ab2e8 100644
--- a/drivers/acpi/acpica/dsutils.c
+++ b/drivers/acpi/acpica/dsutils.c
@@ -5,7 +5,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/dswexec.c b/drivers/acpi/acpica/dswexec.c
index f0280856dc0..6b76c486d78 100644
--- a/drivers/acpi/acpica/dswexec.c
+++ b/drivers/acpi/acpica/dswexec.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/dswload.c b/drivers/acpi/acpica/dswload.c
index b40513dd6a6..140a9d00295 100644
--- a/drivers/acpi/acpica/dswload.c
+++ b/drivers/acpi/acpica/dswload.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/dswscope.c b/drivers/acpi/acpica/dswscope.c
index 908645e72f0..d1e701709da 100644
--- a/drivers/acpi/acpica/dswscope.c
+++ b/drivers/acpi/acpica/dswscope.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/dswstate.c b/drivers/acpi/acpica/dswstate.c
index e46c821cf57..050df816416 100644
--- a/drivers/acpi/acpica/dswstate.c
+++ b/drivers/acpi/acpica/dswstate.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/evevent.c b/drivers/acpi/acpica/evevent.c
index cd55c774e88..c1e6f472d43 100644
--- a/drivers/acpi/acpica/evevent.c
+++ b/drivers/acpi/acpica/evevent.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/evgpe.c b/drivers/acpi/acpica/evgpe.c
index 0b453467a5a..837de669743 100644
--- a/drivers/acpi/acpica/evgpe.c
+++ b/drivers/acpi/acpica/evgpe.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/evgpeblk.c b/drivers/acpi/acpica/evgpeblk.c
index 3d4c4aca11c..fef721917ea 100644
--- a/drivers/acpi/acpica/evgpeblk.c
+++ b/drivers/acpi/acpica/evgpeblk.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/evmisc.c b/drivers/acpi/acpica/evmisc.c
index 8f0fac6c436..9a3cb7045a3 100644
--- a/drivers/acpi/acpica/evmisc.c
+++ b/drivers/acpi/acpica/evmisc.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/evregion.c b/drivers/acpi/acpica/evregion.c
index 5336d911fbf..98fd210e87b 100644
--- a/drivers/acpi/acpica/evregion.c
+++ b/drivers/acpi/acpica/evregion.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -329,7 +329,7 @@ acpi_ev_execute_reg_method(union acpi_operand_object *region_obj, u32 function)
 *              region_offset       - Where in the region to read or write
 *              bit_width           - Field width in bits (8, 16, 32, or 64)
 *              Value               - Pointer to in or out value, must be
- *                                    full 64-bit acpi_integer
+ *                                    a full 64-bit integer
 *
 * RETURN:      Status
 *
@@ -341,8 +341,7 @@ acpi_ev_execute_reg_method(union acpi_operand_object *region_obj, u32 function)
 acpi_status
 acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
                               u32 function,
-                               u32 region_offset,
+                               u32 region_offset, u32 bit_width, u64 *value)
-                               u32 bit_width, acpi_integer * value)
 {
        acpi_status status;
        acpi_adr_space_handler handler;
diff --git a/drivers/acpi/acpica/evrgnini.c b/drivers/acpi/acpica/evrgnini.c
index ff168052a33..2e3b0334072 100644
--- a/drivers/acpi/acpica/evrgnini.c
+++ b/drivers/acpi/acpica/evrgnini.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -168,7 +168,7 @@ acpi_ev_pci_config_region_setup(acpi_handle handle,
                                void *handler_context, void **region_context)
 {
        acpi_status status = AE_OK;
-        acpi_integer pci_value;
+        u64 pci_value;
        struct acpi_pci_id *pci_id = *region_context;
        union acpi_operand_object *handler_obj;
        struct acpi_namespace_node *parent_node;
diff --git a/drivers/acpi/acpica/evsci.c b/drivers/acpi/acpica/evsci.c
index 567b356c85a..8dfbaa96e42 100644
--- a/drivers/acpi/acpica/evsci.c
+++ b/drivers/acpi/acpica/evsci.c
@@ -6,7 +6,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/evxface.c b/drivers/acpi/acpica/evxface.c
index 474e2cab603..b40757955f9 100644
--- a/drivers/acpi/acpica/evxface.c
+++ b/drivers/acpi/acpica/evxface.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/evxfevnt.c b/drivers/acpi/acpica/evxfevnt.c
index 124c157215b..5ff32c78ea2 100644
--- a/drivers/acpi/acpica/evxfevnt.c
+++ b/drivers/acpi/acpica/evxfevnt.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/evxfregn.c b/drivers/acpi/acpica/evxfregn.c
index c98aa7c2d67..541cbc1544d 100644
--- a/drivers/acpi/acpica/evxfregn.c
+++ b/drivers/acpi/acpica/evxfregn.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/exconfig.c b/drivers/acpi/acpica/exconfig.c
index 46adfa541cb..7e8b3bedc37 100644
--- a/drivers/acpi/acpica/exconfig.c
+++ b/drivers/acpi/acpica/exconfig.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -284,7 +284,7 @@ static acpi_status
 acpi_ex_region_read(union acpi_operand_object *obj_desc, u32 length, u8 *buffer)
 {
        acpi_status status;
-        acpi_integer value;
+        u64 value;
        u32 region_offset = 0;
        u32 i;
@@ -490,7 +490,11 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,
        status = acpi_tb_add_table(&table_desc, &table_index);
        if (ACPI_FAILURE(status)) {
-                goto cleanup;
+                /* Delete allocated table buffer */
+                acpi_tb_delete_table(&table_desc);
+                return_ACPI_STATUS(status);
        }
        /*
@@ -533,13 +537,6 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,
                                             acpi_gbl_table_handler_context);
        }
-      cleanup:
-        if (ACPI_FAILURE(status)) {
-                /* Delete allocated table buffer */
-                acpi_tb_delete_table(&table_desc);
-        }
        return_ACPI_STATUS(status);
 }
diff --git a/drivers/acpi/acpica/exconvrt.c b/drivers/acpi/acpica/exconvrt.c
index 51d5f224f9f..bda7aed0404 100644
--- a/drivers/acpi/acpica/exconvrt.c
+++ b/drivers/acpi/acpica/exconvrt.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -51,8 +51,7 @@ ACPI_MODULE_NAME("exconvrt")
 /* Local prototypes */
 static u32
-acpi_ex_convert_to_ascii(acpi_integer integer,
+acpi_ex_convert_to_ascii(u64 integer, u16 base, u8 *string, u8 max_length);
-                         u16 base, u8 * string, u8 max_length);
 /*******************************************************************************
 *
@@ -75,7 +74,7 @@ acpi_ex_convert_to_integer(union acpi_operand_object *obj_desc,
 {
        union acpi_operand_object *return_desc;
        u8 *pointer;
-        acpi_integer result;
+        u64 result;
        u32 i;
        u32 count;
        acpi_status status;
@@ -155,7 +154,7 @@ acpi_ex_convert_to_integer(union acpi_operand_object *obj_desc,
                         * Little endian is used, meaning that the first byte of the buffer
                         * is the LSB of the integer
                         */
-                        result |= (((acpi_integer) pointer[i]) << (i * 8));
+                        result |= (((u64) pointer[i]) << (i * 8));
                }
                break;
@@ -285,10 +284,9 @@ acpi_ex_convert_to_buffer(union acpi_operand_object *obj_desc,
 ******************************************************************************/
 static u32
-acpi_ex_convert_to_ascii(acpi_integer integer,
+acpi_ex_convert_to_ascii(u64 integer, u16 base, u8 *string, u8 data_width)
-                         u16 base, u8 * string, u8 data_width)
 {
-        acpi_integer digit;
+        u64 digit;
        u32 i;
        u32 j;
        u32 k = 0;
@@ -531,10 +529,9 @@ acpi_ex_convert_to_string(union acpi_operand_object * obj_desc,
                 * (separated by commas or spaces)
                 */
                for (i = 0; i < obj_desc->buffer.length; i++) {
-                        new_buf += acpi_ex_convert_to_ascii((acpi_integer)
+                        new_buf += acpi_ex_convert_to_ascii((u64) obj_desc->
-                                                            obj_desc->buffer.
+                                                            buffer.pointer[i],
-                                                            pointer[i], base,
+                                                            base, new_buf, 1);
-                                                            new_buf, 1);
                        *new_buf++ = separator; /* each separated by a comma or space */
                }
diff --git a/drivers/acpi/acpica/excreate.c b/drivers/acpi/acpica/excreate.c
index 02b25d233d9..0aa57d93869 100644
--- a/drivers/acpi/acpica/excreate.c
+++ b/drivers/acpi/acpica/excreate.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/exdump.c b/drivers/acpi/acpica/exdump.c
index de3446372dd..d39d438ba1e 100644
--- a/drivers/acpi/acpica/exdump.c
+++ b/drivers/acpi/acpica/exdump.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/exfield.c b/drivers/acpi/acpica/exfield.c
index 1588a2d660e..6c79fecbee4 100644
--- a/drivers/acpi/acpica/exfield.c
+++ b/drivers/acpi/acpica/exfield.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -130,7 +130,7 @@ acpi_ex_read_data_from_field(struct acpi_walk_state *walk_state,
                /* Call the region handler for the read */
                status = acpi_ex_access_region(obj_desc, 0,
-                                               ACPI_CAST_PTR(acpi_integer,
+                                               ACPI_CAST_PTR(u64,
                                                             buffer_desc->
                                                             buffer.pointer),
                                               function);
@@ -141,7 +141,7 @@ acpi_ex_read_data_from_field(struct acpi_walk_state *walk_state,
        /*
         * Allocate a buffer for the contents of the field.
         *
-         * If the field is larger than the size of an acpi_integer, create
+         * If the field is larger than the current integer width, create
         * a BUFFER to hold it.  Otherwise, use an INTEGER.  This allows
         * the use of arithmetic operators on the returned value if the
         * field size is equal or smaller than an Integer.
@@ -306,8 +306,7 @@ acpi_ex_write_data_to_field(union acpi_operand_object *source_desc,
                 * same buffer)
                 */
                status = acpi_ex_access_region(obj_desc, 0,
-                                               (acpi_integer *) buffer,
+                                               (u64 *) buffer, function);
-                                               function);
                acpi_ex_release_global_lock(obj_desc->common_field.field_flags);
                *result_desc = buffer_desc;
diff --git a/drivers/acpi/acpica/exfldio.c b/drivers/acpi/acpica/exfldio.c
index d7b3b418fb4..f68a216168b 100644
--- a/drivers/acpi/acpica/exfldio.c
+++ b/drivers/acpi/acpica/exfldio.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -55,11 +55,10 @@ ACPI_MODULE_NAME("exfldio")
 static acpi_status
 acpi_ex_field_datum_io(union acpi_operand_object *obj_desc,
                       u32 field_datum_byte_offset,
-                       acpi_integer * value, u32 read_write);
+                       u64 *value, u32 read_write);
 static u8
-acpi_ex_register_overflow(union acpi_operand_object *obj_desc,
+acpi_ex_register_overflow(union acpi_operand_object *obj_desc, u64 value);
-                          acpi_integer value);
 static acpi_status
 acpi_ex_setup_region(union acpi_operand_object *obj_desc,
@@ -212,7 +211,7 @@ acpi_ex_setup_region(union acpi_operand_object *obj_desc,
 *              field_datum_byte_offset - Byte offset of this datum within the
 *                                        parent field
 *              Value                   - Where to store value (must at least
- *                                        the size of acpi_integer)
+ *                                        64 bits)
 *              Function                - Read or Write flag plus other region-
 *                                        dependent flags
 *
@@ -224,8 +223,7 @@ acpi_ex_setup_region(union acpi_operand_object *obj_desc,
 acpi_status
 acpi_ex_access_region(union acpi_operand_object *obj_desc,
-                      u32 field_datum_byte_offset,
+                      u32 field_datum_byte_offset, u64 *value, u32 function)
-                      acpi_integer * value, u32 function)
 {
        acpi_status status;
        union acpi_operand_object *rgn_desc;
@@ -317,8 +315,7 @@ acpi_ex_access_region(union acpi_operand_object *obj_desc,
 ******************************************************************************/
 static u8
-acpi_ex_register_overflow(union acpi_operand_object *obj_desc,
+acpi_ex_register_overflow(union acpi_operand_object *obj_desc, u64 value)
-                          acpi_integer value)
 {
        if (obj_desc->common_field.bit_length >= ACPI_INTEGER_BIT_SIZE) {
@@ -329,7 +326,7 @@ acpi_ex_register_overflow(union acpi_operand_object *obj_desc,
                return (FALSE);
        }
-        if (value >= ((acpi_integer) 1 << obj_desc->common_field.bit_length)) {
+        if (value >= ((u64) 1 << obj_desc->common_field.bit_length)) {
                /*
                 * The Value is larger than the maximum value that can fit into
                 * the register.
@@ -362,11 +359,10 @@ acpi_ex_register_overflow(union acpi_operand_object *obj_desc,
 static acpi_status
 acpi_ex_field_datum_io(union acpi_operand_object *obj_desc,
-                       u32 field_datum_byte_offset,
+                       u32 field_datum_byte_offset, u64 *value, u32 read_write)
-                       acpi_integer * value, u32 read_write)
 {
        acpi_status status;
-        acpi_integer local_value;
+        u64 local_value;
        ACPI_FUNCTION_TRACE_U32(ex_field_datum_io, field_datum_byte_offset);
@@ -439,8 +435,8 @@ acpi_ex_field_datum_io(union acpi_operand_object *obj_desc,
                 * the register
                 */
                if (acpi_ex_register_overflow(obj_desc->bank_field.bank_obj,
-                                              (acpi_integer) obj_desc->
+                                              (u64) obj_desc->bank_field.
-                                              bank_field.value)) {
+                                              value)) {
                        return_ACPI_STATUS(AE_AML_REGISTER_LIMIT);
                }
@@ -481,8 +477,8 @@ acpi_ex_field_datum_io(union acpi_operand_object *obj_desc,
                 * the register
                 */
                if (acpi_ex_register_overflow(obj_desc->index_field.index_obj,
-                                              (acpi_integer) obj_desc->
+                                              (u64) obj_desc->index_field.
-                                              index_field.value)) {
+                                              value)) {
                        return_ACPI_STATUS(AE_AML_REGISTER_LIMIT);
                }
@@ -512,7 +508,7 @@ acpi_ex_field_datum_io(union acpi_operand_object *obj_desc,
                        status =
                            acpi_ex_extract_from_field(obj_desc->index_field.
                                                       data_obj, value,
-                                                       sizeof(acpi_integer));
+                                                       sizeof(u64));
                } else {
                        /* Write the datum to the data_register */
@@ -523,7 +519,7 @@ acpi_ex_field_datum_io(union acpi_operand_object *obj_desc,
                        status =
                            acpi_ex_insert_into_field(obj_desc->index_field.
                                                      data_obj, value,
-                                                      sizeof(acpi_integer));
+                                                      sizeof(u64));
                }
                break;
@@ -571,13 +567,12 @@ acpi_ex_field_datum_io(union acpi_operand_object *obj_desc,
 acpi_status
 acpi_ex_write_with_update_rule(union acpi_operand_object *obj_desc,
-                               acpi_integer mask,
+                               u64 mask,
-                               acpi_integer field_value,
+                               u64 field_value, u32 field_datum_byte_offset)
-                               u32 field_datum_byte_offset)
 {
        acpi_status status = AE_OK;
-        acpi_integer merged_value;
+        u64 merged_value;
-        acpi_integer current_value;
+        u64 current_value;
        ACPI_FUNCTION_TRACE_U32(ex_write_with_update_rule, mask);
@@ -587,7 +582,7 @@ acpi_ex_write_with_update_rule(union acpi_operand_object *obj_desc,
        /* If the mask is all ones, we don't need to worry about the update rule */
-        if (mask != ACPI_INTEGER_MAX) {
+        if (mask != ACPI_UINT64_MAX) {
                /* Decode the update rule */
@@ -678,8 +673,8 @@ acpi_ex_extract_from_field(union acpi_operand_object *obj_desc,
                           void *buffer, u32 buffer_length)
 {
        acpi_status status;
-        acpi_integer raw_datum;
+        u64 raw_datum;
-        acpi_integer merged_datum;
+        u64 merged_datum;
        u32 field_offset = 0;
        u32 buffer_offset = 0;
        u32 buffer_tail_bits;
@@ -804,10 +799,10 @@ acpi_ex_insert_into_field(union acpi_operand_object *obj_desc,
                          void *buffer, u32 buffer_length)
 {
        acpi_status status;
-        acpi_integer mask;
+        u64 mask;
-        acpi_integer width_mask;
+        u64 width_mask;
-        acpi_integer merged_datum;
+        u64 merged_datum;
-        acpi_integer raw_datum = 0;
+        u64 raw_datum = 0;
        u32 field_offset = 0;
        u32 buffer_offset = 0;
        u32 buffer_tail_bits;
@@ -855,7 +850,7 @@ acpi_ex_insert_into_field(union acpi_operand_object *obj_desc,
         * shift operator
         */
        if (obj_desc->common_field.access_bit_width == ACPI_INTEGER_BIT_SIZE) {
-                width_mask = ACPI_INTEGER_MAX;
+                width_mask = ACPI_UINT64_MAX;
        } else {
                width_mask =
                    ACPI_MASK_BITS_ABOVE(obj_desc->common_field.
diff --git a/drivers/acpi/acpica/exmisc.c b/drivers/acpi/acpica/exmisc.c
index 998eac32993..c5bb1eeed2d 100644
--- a/drivers/acpi/acpica/exmisc.c
+++ b/drivers/acpi/acpica/exmisc.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -409,8 +409,7 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0,
 *
 ******************************************************************************/
-acpi_integer
+u64 acpi_ex_do_math_op(u16 opcode, u64 integer0, u64 integer1)
-acpi_ex_do_math_op(u16 opcode, acpi_integer integer0, acpi_integer integer1)
 {
        ACPI_FUNCTION_ENTRY();
@@ -498,8 +497,7 @@ acpi_ex_do_math_op(u16 opcode, acpi_integer integer0, acpi_integer integer1)
 acpi_status
 acpi_ex_do_logical_numeric_op(u16 opcode,
-                              acpi_integer integer0,
+                              u64 integer0, u64 integer1, u8 *logical_result)
-                              acpi_integer integer1, u8 * logical_result)
 {
        acpi_status status = AE_OK;
        u8 local_result = FALSE;
@@ -564,8 +562,8 @@ acpi_ex_do_logical_op(u16 opcode,
                      union acpi_operand_object *operand1, u8 * logical_result)
 {
        union acpi_operand_object *local_operand1 = operand1;
-        acpi_integer integer0;
+        u64 integer0;
-        acpi_integer integer1;
+        u64 integer1;
        u32 length0;
        u32 length1;
        acpi_status status = AE_OK;
diff --git a/drivers/acpi/acpica/exmutex.c b/drivers/acpi/acpica/exmutex.c
index 3c456bd575d..cc8a10268f6 100644
--- a/drivers/acpi/acpica/exmutex.c
+++ b/drivers/acpi/acpica/exmutex.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/exnames.c b/drivers/acpi/acpica/exnames.c
index ffdae122d94..679f308c5a8 100644
--- a/drivers/acpi/acpica/exnames.c
+++ b/drivers/acpi/acpica/exnames.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/exoparg1.c b/drivers/acpi/acpica/exoparg1.c
index 752fe48b2d2..99adbab5acb 100644
--- a/drivers/acpi/acpica/exoparg1.c
+++ b/drivers/acpi/acpica/exoparg1.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -261,8 +261,8 @@ acpi_status acpi_ex_opcode_1A_1T_1R(struct acpi_walk_state *walk_state)
        union acpi_operand_object *return_desc2 = NULL;
        u32 temp32;
        u32 i;
-        acpi_integer power_of_ten;
+        u64 power_of_ten;
-        acpi_integer digit;
+        u64 digit;
        ACPI_FUNCTION_TRACE_STR(ex_opcode_1A_1T_1R,
                                acpi_ps_get_opcode_name(walk_state->opcode));
@@ -362,7 +362,7 @@ acpi_status acpi_ex_opcode_1A_1T_1R(struct acpi_walk_state *walk_state)
                                /* Sum the digit into the result with the current power of 10 */
                                return_desc->integer.value +=
-                                    (((acpi_integer) temp32) * power_of_ten);
+                                    (((u64) temp32) * power_of_ten);
                                /* Shift to next BCD digit */
@@ -392,7 +392,7 @@ acpi_status acpi_ex_opcode_1A_1T_1R(struct acpi_walk_state *walk_state)
                                 * remainder from above
                                 */
                                return_desc->integer.value |=
-                                    (((acpi_integer) temp32) << ACPI_MUL_4(i));
+                                    (((u64) temp32) << ACPI_MUL_4(i));
                        }
                        /* Overflow if there is any data left in Digit */
@@ -439,7 +439,7 @@ acpi_status acpi_ex_opcode_1A_1T_1R(struct acpi_walk_state *walk_state)
                        /* The object exists in the namespace, return TRUE */
-                        return_desc->integer.value = ACPI_INTEGER_MAX;
+                        return_desc->integer.value = ACPI_UINT64_MAX;
                        goto cleanup;
                default:
@@ -589,7 +589,7 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
        union acpi_operand_object *return_desc = NULL;
        acpi_status status = AE_OK;
        u32 type;
-        acpi_integer value;
+        u64 value;
        ACPI_FUNCTION_TRACE_STR(ex_opcode_1A_0T_1R,
                                acpi_ps_get_opcode_name(walk_state->opcode));
@@ -610,7 +610,7 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
                 * return_desc->Integer.Value is initially == 0 (FALSE) from above.
                 */
                if (!operand[0]->integer.value) {
-                        return_desc->integer.value = ACPI_INTEGER_MAX;
+                        return_desc->integer.value = ACPI_UINT64_MAX;
                }
                break;
diff --git a/drivers/acpi/acpica/exoparg2.c b/drivers/acpi/acpica/exoparg2.c
index 85d95c92dfd..22841bbbe63 100644
--- a/drivers/acpi/acpica/exoparg2.c
+++ b/drivers/acpi/acpica/exoparg2.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -282,7 +282,7 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state)
 {
        union acpi_operand_object **operand = &walk_state->operands[0];
        union acpi_operand_object *return_desc = NULL;
-        acpi_integer index;
+        u64 index;
        acpi_status status = AE_OK;
        acpi_size length;
@@ -584,7 +584,7 @@ acpi_status acpi_ex_opcode_2A_0T_1R(struct acpi_walk_state *walk_state)
         * Default is FALSE (zero)
         */
        if (logical_result) {
-                return_desc->integer.value = ACPI_INTEGER_MAX;
+                return_desc->integer.value = ACPI_UINT64_MAX;
        }
      cleanup:
diff --git a/drivers/acpi/acpica/exoparg3.c b/drivers/acpi/acpica/exoparg3.c
index 253f9e12258..8bb1012ef44 100644
--- a/drivers/acpi/acpica/exoparg3.c
+++ b/drivers/acpi/acpica/exoparg3.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -148,7 +148,7 @@ acpi_status acpi_ex_opcode_3A_1T_1R(struct acpi_walk_state *walk_state)
        union acpi_operand_object *return_desc = NULL;
        char *buffer = NULL;
        acpi_status status = AE_OK;
-        acpi_integer index;
+        u64 index;
        acpi_size length;
        ACPI_FUNCTION_TRACE_STR(ex_opcode_3A_1T_1R,
diff --git a/drivers/acpi/acpica/exoparg6.c b/drivers/acpi/acpica/exoparg6.c
index 295542e6bd5..f256b6a25f2 100644
--- a/drivers/acpi/acpica/exoparg6.c
+++ b/drivers/acpi/acpica/exoparg6.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -218,7 +218,7 @@ acpi_status acpi_ex_opcode_6A_0T_1R(struct acpi_walk_state * walk_state)
        union acpi_operand_object **operand = &walk_state->operands[0];
        union acpi_operand_object *return_desc = NULL;
        acpi_status status = AE_OK;
-        acpi_integer index;
+        u64 index;
        union acpi_operand_object *this_element;
        ACPI_FUNCTION_TRACE_STR(ex_opcode_6A_0T_1R,
@@ -253,9 +253,9 @@ acpi_status acpi_ex_opcode_6A_0T_1R(struct acpi_walk_state * walk_state)
                }
                /* Create an integer for the return value */
-                /* Default return value is ACPI_INTEGER_MAX if no match found */
+                /* Default return value is ACPI_UINT64_MAX if no match found */
-                return_desc = acpi_ut_create_integer_object(ACPI_INTEGER_MAX);
+                return_desc = acpi_ut_create_integer_object(ACPI_UINT64_MAX);
                if (!return_desc) {
                        status = AE_NO_MEMORY;
                        goto cleanup;
@@ -270,7 +270,7 @@ acpi_status acpi_ex_opcode_6A_0T_1R(struct acpi_walk_state * walk_state)
                 *
                 * Upon finding a match, the loop will terminate via "break" at
                 * the bottom.  If it terminates "normally", match_value will be
-                 * ACPI_INTEGER_MAX (Ones) (its initial value) indicating that no
+                 * ACPI_UINT64_MAX (Ones) (its initial value) indicating that no
                 * match was found.
                 */
                for (; index < operand[0]->package.count; index++) {
diff --git a/drivers/acpi/acpica/exprep.c b/drivers/acpi/acpica/exprep.c
index 52fec07064f..edf62bf5b26 100644
--- a/drivers/acpi/acpica/exprep.c
+++ b/drivers/acpi/acpica/exprep.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/exregion.c b/drivers/acpi/acpica/exregion.c
index 2bd83ac57c3..486b2e5661b 100644
--- a/drivers/acpi/acpica/exregion.c
+++ b/drivers/acpi/acpica/exregion.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -70,7 +70,7 @@ acpi_status
 acpi_ex_system_memory_space_handler(u32 function,
                                    acpi_physical_address address,
                                    u32 bit_width,
-                                    acpi_integer * value,
+                                    u64 *value,
                                    void *handler_context, void *region_context)
 {
        acpi_status status = AE_OK;
@@ -115,8 +115,7 @@ acpi_ex_system_memory_space_handler(u32 function,
         * Hardware does not support non-aligned data transfers, we must verify
         * the request.
         */
-        (void)acpi_ut_short_divide((acpi_integer) address, length, NULL,
+        (void)acpi_ut_short_divide((u64) address, length, NULL, &remainder);
-                                   &remainder);
        if (remainder != 0) {
                return_ACPI_STATUS(AE_AML_ALIGNMENT);
        }
@@ -128,10 +127,9 @@ acpi_ex_system_memory_space_handler(u32 function,
         *    2) Address beyond the current mapping?
         */
        if ((address < mem_info->mapped_physical_address) ||
-            (((acpi_integer) address + length) > ((acpi_integer)
+            (((u64) address + length) > ((u64)
-                                                  mem_info->
+                                         mem_info->mapped_physical_address +
-                                                  mapped_physical_address +
+                                         mem_info->mapped_length))) {
-                                                  mem_info->mapped_length))) {
                /*
                 * The request cannot be resolved by the current memory mapping;
                 * Delete the existing mapping and create a new one.
@@ -193,8 +191,7 @@ acpi_ex_system_memory_space_handler(u32 function,
         * access
         */
        logical_addr_ptr = mem_info->mapped_logical_address +
-            ((acpi_integer) address -
+            ((u64) address - (u64) mem_info->mapped_physical_address);
-             (acpi_integer) mem_info->mapped_physical_address);
        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                          "System-Memory (width %d) R/W %d Address=%8.8X%8.8X\n",
@@ -215,19 +212,19 @@ acpi_ex_system_memory_space_handler(u32 function,
                *value = 0;
                switch (bit_width) {
                case 8:
-                        *value = (acpi_integer) ACPI_GET8(logical_addr_ptr);
+                        *value = (u64) ACPI_GET8(logical_addr_ptr);
                        break;
                case 16:
-                        *value = (acpi_integer) ACPI_GET16(logical_addr_ptr);
+                        *value = (u64) ACPI_GET16(logical_addr_ptr);
                        break;
                case 32:
-                        *value = (acpi_integer) ACPI_GET32(logical_addr_ptr);
+                        *value = (u64) ACPI_GET32(logical_addr_ptr);
                        break;
                case 64:
-                        *value = (acpi_integer) ACPI_GET64(logical_addr_ptr);
+                        *value = (u64) ACPI_GET64(logical_addr_ptr);
                        break;
                default:
@@ -291,7 +288,7 @@ acpi_status
 acpi_ex_system_io_space_handler(u32 function,
                                acpi_physical_address address,
                                u32 bit_width,
-                                acpi_integer * value,
+                                u64 *value,
                                void *handler_context, void *region_context)
 {
        acpi_status status = AE_OK;
@@ -350,7 +347,7 @@ acpi_status
 acpi_ex_pci_config_space_handler(u32 function,
                                 acpi_physical_address address,
                                 u32 bit_width,
-                                 acpi_integer * value,
+                                 u64 *value,
                                 void *handler_context, void *region_context)
 {
        acpi_status status = AE_OK;
@@ -425,7 +422,7 @@ acpi_status
 acpi_ex_cmos_space_handler(u32 function,
                           acpi_physical_address address,
                           u32 bit_width,
-                           acpi_integer * value,
+                           u64 *value,
                           void *handler_context, void *region_context)
 {
        acpi_status status = AE_OK;
@@ -457,7 +454,7 @@ acpi_status
 acpi_ex_pci_bar_space_handler(u32 function,
                              acpi_physical_address address,
                              u32 bit_width,
-                              acpi_integer * value,
+                              u64 *value,
                              void *handler_context, void *region_context)
 {
        acpi_status status = AE_OK;
@@ -489,7 +486,7 @@ acpi_status
 acpi_ex_data_table_space_handler(u32 function,
                                 acpi_physical_address address,
                                 u32 bit_width,
-                                 acpi_integer * value,
+                                 u64 *value,
                                 void *handler_context, void *region_context)
 {
        ACPI_FUNCTION_TRACE(ex_data_table_space_handler);
diff --git a/drivers/acpi/acpica/exresnte.c b/drivers/acpi/acpica/exresnte.c
index 607958ff467..fdc1b27999e 100644
--- a/drivers/acpi/acpica/exresnte.c
+++ b/drivers/acpi/acpica/exresnte.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/exresolv.c b/drivers/acpi/acpica/exresolv.c
index c93b54ce7f7..fdd6a7079b9 100644
--- a/drivers/acpi/acpica/exresolv.c
+++ b/drivers/acpi/acpica/exresolv.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/exresop.c b/drivers/acpi/acpica/exresop.c
index 5c729a9e913..c5ecd615f14 100644
--- a/drivers/acpi/acpica/exresop.c
+++ b/drivers/acpi/acpica/exresop.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/exstore.c b/drivers/acpi/acpica/exstore.c
index 6efd07a4f77..702b9ecfd44 100644
--- a/drivers/acpi/acpica/exstore.c
+++ b/drivers/acpi/acpica/exstore.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/exstoren.c b/drivers/acpi/acpica/exstoren.c
index 608e838d537..d4af684620c 100644
--- a/drivers/acpi/acpica/exstoren.c
+++ b/drivers/acpi/acpica/exstoren.c
@@ -7,7 +7,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/exstorob.c b/drivers/acpi/acpica/exstorob.c
index 257706e7734..e972b667b09 100644
--- a/drivers/acpi/acpica/exstorob.c
+++ b/drivers/acpi/acpica/exstorob.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/exsystem.c b/drivers/acpi/acpica/exsystem.c
index 3d00b935723..e11b6cb42a5 100644
--- a/drivers/acpi/acpica/exsystem.c
+++ b/drivers/acpi/acpica/exsystem.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -193,7 +193,7 @@ acpi_status acpi_ex_system_do_stall(u32 how_long)
 *
 ******************************************************************************/
-acpi_status acpi_ex_system_do_suspend(acpi_integer how_long)
+acpi_status acpi_ex_system_do_suspend(u64 how_long)
 {
        ACPI_FUNCTION_ENTRY();
diff --git a/drivers/acpi/acpica/exutils.c b/drivers/acpi/acpica/exutils.c
index 7d41f99f705..74c24d517f8 100644
--- a/drivers/acpi/acpica/exutils.c
+++ b/drivers/acpi/acpica/exutils.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -67,7 +67,7 @@
 ACPI_MODULE_NAME("exutils")
 /* Local prototypes */
-static u32 acpi_ex_digits_needed(acpi_integer value, u32 base);
+static u32 acpi_ex_digits_needed(u64 value, u32 base);
 #ifndef ACPI_NO_METHOD_EXECUTION
 /*******************************************************************************
@@ -230,7 +230,7 @@ void acpi_ex_truncate_for32bit_table(union acpi_operand_object *obj_desc)
                 * We are running a method that exists in a 32-bit ACPI table.
                 * Truncate the value to 32 bits by zeroing out the upper 32-bit field
                 */
-                obj_desc->integer.value &= (acpi_integer) ACPI_UINT32_MAX;
+                obj_desc->integer.value &= (u64) ACPI_UINT32_MAX;
        }
 }
@@ -327,14 +327,14 @@ void acpi_ex_release_global_lock(u32 field_flags)
 *
 ******************************************************************************/
-static u32 acpi_ex_digits_needed(acpi_integer value, u32 base)
+static u32 acpi_ex_digits_needed(u64 value, u32 base)
 {
        u32 num_digits;
-        acpi_integer current_value;
+        u64 current_value;
        ACPI_FUNCTION_TRACE(ex_digits_needed);
-        /* acpi_integer is unsigned, so we don't worry about a '-' prefix */
+        /* u64 is unsigned, so we don't worry about a '-' prefix */
        if (value == 0) {
                return_UINT32(1);
@@ -370,7 +370,7 @@ static u32 acpi_ex_digits_needed(acpi_integer value, u32 base)
 *
 ******************************************************************************/
-void acpi_ex_eisa_id_to_string(char *out_string, acpi_integer compressed_id)
+void acpi_ex_eisa_id_to_string(char *out_string, u64 compressed_id)
 {
        u32 swapped_id;
@@ -394,10 +394,10 @@ void acpi_ex_eisa_id_to_string(char *out_string, acpi_integer compressed_id)
            (char)(0x40 + (((unsigned long)swapped_id >> 26) & 0x1F));
        out_string[1] = (char)(0x40 + ((swapped_id >> 21) & 0x1F));
        out_string[2] = (char)(0x40 + ((swapped_id >> 16) & 0x1F));
-        out_string[3] = acpi_ut_hex_to_ascii_char((acpi_integer)swapped_id, 12);
+        out_string[3] = acpi_ut_hex_to_ascii_char((u64) swapped_id, 12);
-        out_string[4] = acpi_ut_hex_to_ascii_char((acpi_integer)swapped_id, 8);
+        out_string[4] = acpi_ut_hex_to_ascii_char((u64) swapped_id, 8);
-        out_string[5] = acpi_ut_hex_to_ascii_char((acpi_integer)swapped_id, 4);
+        out_string[5] = acpi_ut_hex_to_ascii_char((u64) swapped_id, 4);
-        out_string[6] = acpi_ut_hex_to_ascii_char((acpi_integer)swapped_id, 0);
+        out_string[6] = acpi_ut_hex_to_ascii_char((u64) swapped_id, 0);
        out_string[7] = 0;
 }
@@ -418,7 +418,7 @@ void acpi_ex_eisa_id_to_string(char *out_string, acpi_integer compressed_id)
 *
 ******************************************************************************/
-void acpi_ex_integer_to_string(char *out_string, acpi_integer value)
+void acpi_ex_integer_to_string(char *out_string, u64 value)
 {
        u32 count;
        u32 digits_needed;
diff --git a/drivers/acpi/acpica/hwacpi.c b/drivers/acpi/acpica/hwacpi.c
index 9af361a191e..679a112a7d2 100644
--- a/drivers/acpi/acpica/hwacpi.c
+++ b/drivers/acpi/acpica/hwacpi.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/hwgpe.c b/drivers/acpi/acpica/hwgpe.c
index c28c41b3180..bd72319a38f 100644
--- a/drivers/acpi/acpica/hwgpe.c
+++ b/drivers/acpi/acpica/hwgpe.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -224,7 +224,7 @@ acpi_hw_get_gpe_status(struct acpi_gpe_event_info * gpe_event_info,
        status = acpi_hw_read(&in_byte, &gpe_register_info->status_address);
        if (ACPI_FAILURE(status)) {
-                goto unlock_and_exit;
+                return (status);
        }
        if (register_bit & in_byte) {
@@ -234,9 +234,7 @@ acpi_hw_get_gpe_status(struct acpi_gpe_event_info * gpe_event_info,
        /* Set return value */
        (*event_status) = local_event_status;
+        return (AE_OK);
-      unlock_and_exit:
-        return (status);
 }
 /******************************************************************************
diff --git a/drivers/acpi/acpica/hwregs.c b/drivers/acpi/acpica/hwregs.c
index 15c9ed2be85..ec7fc227b33 100644
--- a/drivers/acpi/acpica/hwregs.c
+++ b/drivers/acpi/acpica/hwregs.c
@@ -7,7 +7,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/hwsleep.c b/drivers/acpi/acpica/hwsleep.c
index cc22f9a585b..5e6d4dbb802 100644
--- a/drivers/acpi/acpica/hwsleep.c
+++ b/drivers/acpi/acpica/hwsleep.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/hwtimer.c b/drivers/acpi/acpica/hwtimer.c
index 6b282e85d03..1ef8e0bb250 100644
--- a/drivers/acpi/acpica/hwtimer.c
+++ b/drivers/acpi/acpica/hwtimer.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -140,7 +140,7 @@ acpi_get_timer_duration(u32 start_ticks, u32 end_ticks, u32 * time_elapsed)
 {
        acpi_status status;
        u32 delta_ticks;
-        acpi_integer quotient;
+        u64 quotient;
        ACPI_FUNCTION_TRACE(acpi_get_timer_duration);
diff --git a/drivers/acpi/acpica/hwvalid.c b/drivers/acpi/acpica/hwvalid.c
index ec33f270c5b..e26c17d4b71 100644
--- a/drivers/acpi/acpica/hwvalid.c
+++ b/drivers/acpi/acpica/hwvalid.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2009, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/hwxface.c b/drivers/acpi/acpica/hwxface.c
index 647c7b6e675..50cc3be7772 100644
--- a/drivers/acpi/acpica/hwxface.c
+++ b/drivers/acpi/acpica/hwxface.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/nsaccess.c b/drivers/acpi/acpica/nsaccess.c
index d622ba77000..aa2b80132d0 100644
--- a/drivers/acpi/acpica/nsaccess.c
+++ b/drivers/acpi/acpica/nsaccess.c
@@ -5,7 +5,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/nsalloc.c b/drivers/acpi/acpica/nsalloc.c
index 8a58a1b85aa..982269c1fa4 100644
--- a/drivers/acpi/acpica/nsalloc.c
+++ b/drivers/acpi/acpica/nsalloc.c
@@ -5,7 +5,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/nsdump.c b/drivers/acpi/acpica/nsdump.c
index e37836e27e2..0689d36638d 100644
--- a/drivers/acpi/acpica/nsdump.c
+++ b/drivers/acpi/acpica/nsdump.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/nsdumpdv.c b/drivers/acpi/acpica/nsdumpdv.c
index 36be7f0e97e..d2a97921e24 100644
--- a/drivers/acpi/acpica/nsdumpdv.c
+++ b/drivers/acpi/acpica/nsdumpdv.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/nseval.c b/drivers/acpi/acpica/nseval.c
index af9fe910373..f52829cc294 100644
--- a/drivers/acpi/acpica/nseval.c
+++ b/drivers/acpi/acpica/nseval.c
@@ -5,7 +5,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/nsinit.c b/drivers/acpi/acpica/nsinit.c
index 4f8abac231d..9bd6f050f29 100644
--- a/drivers/acpi/acpica/nsinit.c
+++ b/drivers/acpi/acpica/nsinit.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/nsload.c b/drivers/acpi/acpica/nsload.c
index a7234e60e98..df18be94fef 100644
--- a/drivers/acpi/acpica/nsload.c
+++ b/drivers/acpi/acpica/nsload.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/nsnames.c b/drivers/acpi/acpica/nsnames.c
index 8f9a4875ce2..95937245163 100644
--- a/drivers/acpi/acpica/nsnames.c
+++ b/drivers/acpi/acpica/nsnames.c
@@ -5,7 +5,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/nsobject.c b/drivers/acpi/acpica/nsobject.c
index 60f3af08d28..41a9213dd5a 100644
--- a/drivers/acpi/acpica/nsobject.c
+++ b/drivers/acpi/acpica/nsobject.c
@@ -6,7 +6,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/nsparse.c b/drivers/acpi/acpica/nsparse.c
index 662a4bd5b62..27cda52c76b 100644
--- a/drivers/acpi/acpica/nsparse.c
+++ b/drivers/acpi/acpica/nsparse.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/nspredef.c b/drivers/acpi/acpica/nspredef.c
index d34fa59548f..7096bcda0c7 100644
--- a/drivers/acpi/acpica/nspredef.c
+++ b/drivers/acpi/acpica/nspredef.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -231,6 +231,7 @@ acpi_ns_check_predefined_names(struct acpi_namespace_node *node,
         * Note: Package may have been newly created by call above.
         */
        if ((*return_object_ptr)->common.type == ACPI_TYPE_PACKAGE) {
+                data->parent_package = *return_object_ptr;
                status = acpi_ns_check_package(data, return_object_ptr);
                if (ACPI_FAILURE(status)) {
                        goto exit;
@@ -710,6 +711,7 @@ acpi_ns_check_package_list(struct acpi_predefined_data *data,
        for (i = 0; i < count; i++) {
                sub_package = *elements;
                sub_elements = sub_package->package.elements;
+                data->parent_package = sub_package;
                /* Each sub-object must be of type Package */
@@ -721,6 +723,7 @@ acpi_ns_check_package_list(struct acpi_predefined_data *data,
                /* Examine the different types of expected sub-packages */
+                data->parent_package = sub_package;
                switch (package->ret_info.type) {
                case ACPI_PTYPE2:
                case ACPI_PTYPE2_PKG_COUNT:
@@ -800,7 +803,7 @@ acpi_ns_check_package_list(struct acpi_predefined_data *data,
                        /*
                         * First element is the (Integer) count of elements, including
-                         * the count field.
+                         * the count field (the ACPI name is num_elements)
                         */
                        status = acpi_ns_check_object_type(data, sub_elements,
                                                           ACPI_RTYPE_INTEGER,
@@ -822,6 +825,16 @@ acpi_ns_check_package_list(struct acpi_predefined_data *data,
                                expected_count = package->ret_info.count1;
                                goto package_too_small;
                        }
+                        if (expected_count == 0) {
+                                /*
+                                 * Either the num_entries element was originally zero or it was
+                                 * a NULL element and repaired to an Integer of value zero.
+                                 * In either case, repair it by setting num_entries to be the
+                                 * actual size of the subpackage.
+                                 */
+                                expected_count = sub_package->package.count;
+                                (*sub_elements)->integer.value = expected_count;
+                        }
                        /* Check the type of each sub-package element */
@@ -945,10 +958,18 @@ acpi_ns_check_object_type(struct acpi_predefined_data *data,
        char type_buffer[48];   /* Room for 5 types */
        /*
-         * If we get a NULL return_object here, it is a NULL package element,
+         * If we get a NULL return_object here, it is a NULL package element.
-         * and this is always an error.
+         * Since all extraneous NULL package elements were removed earlier by a
+         * call to acpi_ns_remove_null_elements, this is an unexpected NULL element.
+         * We will attempt to repair it.
         */
        if (!return_object) {
+                status = acpi_ns_repair_null_element(data, expected_btypes,
+                                                     package_index,
+                                                     return_object_ptr);
+                if (ACPI_SUCCESS(status)) {
+                        return (AE_OK); /* Repair was successful */
+                }
                goto type_error_exit;
        }
@@ -1000,27 +1021,25 @@ acpi_ns_check_object_type(struct acpi_predefined_data *data,
        /* Is the object one of the expected types? */
-        if (!(return_btype & expected_btypes)) {
+        if (return_btype & expected_btypes) {
-                /* Type mismatch -- attempt repair of the returned object */
+                /* For reference objects, check that the reference type is correct */
-                status = acpi_ns_repair_object(data, expected_btypes,
+                if (return_object->common.type == ACPI_TYPE_LOCAL_REFERENCE) {
-                                               package_index,
+                        status = acpi_ns_check_reference(data, return_object);
-                                               return_object_ptr);
-                if (ACPI_SUCCESS(status)) {
-                        return (AE_OK); /* Repair was successful */
                }
-                goto type_error_exit;
+                return (status);
        }
-        /* For reference objects, check that the reference type is correct */
+        /* Type mismatch -- attempt repair of the returned object */
-        if (return_object->common.type == ACPI_TYPE_LOCAL_REFERENCE) {
+        status = acpi_ns_repair_object(data, expected_btypes,
-                status = acpi_ns_check_reference(data, return_object);
+                                       package_index, return_object_ptr);
+        if (ACPI_SUCCESS(status)) {
+                return (AE_OK); /* Repair was successful */
        }
-        return (status);
      type_error_exit:
        /* Create a string with all expected types for this predefined object */
diff --git a/drivers/acpi/acpica/nsrepair.c b/drivers/acpi/acpica/nsrepair.c
index 4fd1bdb056b..d4be37751be 100644
--- a/drivers/acpi/acpica/nsrepair.c
+++ b/drivers/acpi/acpica/nsrepair.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2009, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -45,6 +45,7 @@
 #include "accommon.h"
 #include "acnamesp.h"
 #include "acinterp.h"
+#include "acpredef.h"
 #define _COMPONENT          ACPI_NAMESPACE
 ACPI_MODULE_NAME("nsrepair")
@@ -71,6 +72,12 @@ ACPI_MODULE_NAME("nsrepair")
 * Buffer  -> Package of Integers
 * Package -> Package of one Package
 *
+ * Additional possible repairs:
+ *
+ * Optional/unnecessary NULL package elements removed
+ * Required package elements that are NULL replaced by Integer/String/Buffer
+ * Incorrect standalone package wrapped with required outer package
+ *
 ******************************************************************************/
 /* Local prototypes */
 static acpi_status
@@ -506,6 +513,172 @@ acpi_ns_convert_to_package(union acpi_operand_object *original_object,
 /*******************************************************************************
 *
+ * FUNCTION:    acpi_ns_repair_null_element
+ *
+ * PARAMETERS:  Data                - Pointer to validation data structure
+ *              expected_btypes     - Object types expected
+ *              package_index       - Index of object within parent package (if
+ *                                    applicable - ACPI_NOT_PACKAGE_ELEMENT
+ *                                    otherwise)
+ *              return_object_ptr   - Pointer to the object returned from the
+ *                                    evaluation of a method or object
+ *
+ * RETURN:      Status. AE_OK if repair was successful.
+ *
+ * DESCRIPTION: Attempt to repair a NULL element of a returned Package object.
+ *
+ ******************************************************************************/
+acpi_status
+acpi_ns_repair_null_element(struct acpi_predefined_data *data,
+                            u32 expected_btypes,
+                            u32 package_index,
+                            union acpi_operand_object **return_object_ptr)
+{
+        union acpi_operand_object *return_object = *return_object_ptr;
+        union acpi_operand_object *new_object;
+        ACPI_FUNCTION_NAME(ns_repair_null_element);
+        /* No repair needed if return object is non-NULL */
+        if (return_object) {
+                return (AE_OK);
+        }
+        /*
+         * Attempt to repair a NULL element of a Package object. This applies to
+         * predefined names that return a fixed-length package and each element
+         * is required. It does not apply to variable-length packages where NULL
+         * elements are allowed, especially at the end of the package.
+         */
+        if (expected_btypes & ACPI_RTYPE_INTEGER) {
+                /* Need an Integer - create a zero-value integer */
+                new_object = acpi_ut_create_integer_object(0);
+        } else if (expected_btypes & ACPI_RTYPE_STRING) {
+                /* Need a String - create a NULL string */
+                new_object = acpi_ut_create_string_object(0);
+        } else if (expected_btypes & ACPI_RTYPE_BUFFER) {
+                /* Need a Buffer - create a zero-length buffer */
+                new_object = acpi_ut_create_buffer_object(0);
+        } else {
+                /* Error for all other expected types */
+                return (AE_AML_OPERAND_TYPE);
+        }
+        if (!new_object) {
+                return (AE_NO_MEMORY);
+        }
+        /* Set the reference count according to the parent Package object */
+        new_object->common.reference_count =
+            data->parent_package->common.reference_count;
+        ACPI_DEBUG_PRINT((ACPI_DB_REPAIR,
+                          "%s: Converted NULL package element to expected %s at index %u\n",
+                          data->pathname,
+                          acpi_ut_get_object_type_name(new_object),
+                          package_index));
+        *return_object_ptr = new_object;
+        data->flags |= ACPI_OBJECT_REPAIRED;
+        return (AE_OK);
+}
+/******************************************************************************
+ *
+ * FUNCTION:    acpi_ns_remove_null_elements
+ *
+ * PARAMETERS:  Data                - Pointer to validation data structure
+ *              package_type        - An acpi_return_package_types value
+ *              obj_desc            - A Package object
+ *
+ * RETURN:      None.
+ *
+ * DESCRIPTION: Remove all NULL package elements from packages that contain
+ *              a variable number of sub-packages. For these types of
+ *              packages, NULL elements can be safely removed.
+ *
+ *****************************************************************************/
+void
+acpi_ns_remove_null_elements(struct acpi_predefined_data *data,
+                             u8 package_type,
+                             union acpi_operand_object *obj_desc)
+{
+        union acpi_operand_object **source;
+        union acpi_operand_object **dest;
+        u32 count;
+        u32 new_count;
+        u32 i;
+        ACPI_FUNCTION_NAME(ns_remove_null_elements);
+        /*
+         * PTYPE1 packages contain no subpackages.
+         * PTYPE2 packages contain a variable number of sub-packages. We can
+         * safely remove all NULL elements from the PTYPE2 packages.
+         */
+        switch (package_type) {
+        case ACPI_PTYPE1_FIXED:
+        case ACPI_PTYPE1_VAR:
+        case ACPI_PTYPE1_OPTION:
+                return;
+        case ACPI_PTYPE2:
+        case ACPI_PTYPE2_COUNT:
+        case ACPI_PTYPE2_PKG_COUNT:
+        case ACPI_PTYPE2_FIXED:
+        case ACPI_PTYPE2_MIN:
+        case ACPI_PTYPE2_REV_FIXED:
+                break;
+        default:
+                return;
+        }
+        count = obj_desc->package.count;
+        new_count = count;
+        source = obj_desc->package.elements;
+        dest = source;
+        /* Examine all elements of the package object, remove nulls */
+        for (i = 0; i < count; i++) {
+                if (!*source) {
+                        new_count--;
+                } else {
+                        *dest = *source;
+                        dest++;
+                }
+                source++;
+        }
+        /* Update parent package if any null elements were removed */
+        if (new_count < count) {
+                ACPI_DEBUG_PRINT((ACPI_DB_REPAIR,
+                                  "%s: Found and removed %u NULL elements\n",
+                                  data->pathname, (count - new_count)));
+                /* NULL terminate list and update the package count */
+                *dest = NULL;
+                obj_desc->package.count = new_count;
+        }
+}
+/*******************************************************************************
+ *
 * FUNCTION:    acpi_ns_repair_package_list
 *
 * PARAMETERS:  Data                - Pointer to validation data structure
diff --git a/drivers/acpi/acpica/nsrepair2.c b/drivers/acpi/acpica/nsrepair2.c
index f13691c1cca..61bd0f6755d 100644
--- a/drivers/acpi/acpica/nsrepair2.c
+++ b/drivers/acpi/acpica/nsrepair2.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2009, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -45,7 +45,6 @@
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acnamesp.h"
-#include "acpredef.h"
 #define _COMPONENT          ACPI_NAMESPACE
 ACPI_MODULE_NAME("nsrepair2")
@@ -93,7 +92,7 @@ acpi_ns_check_sorted_list(struct acpi_predefined_data *data,
                          u32 sort_index,
                          u8 sort_direction, char *sort_key_name);
-static acpi_status
+static void
 acpi_ns_sort_list(union acpi_operand_object **elements,
                  u32 count, u32 index, u8 sort_direction);
@@ -443,7 +442,6 @@ acpi_ns_check_sorted_list(struct acpi_predefined_data *data,
        union acpi_operand_object *obj_desc;
        u32 i;
        u32 previous_value;
-        acpi_status status;
        ACPI_FUNCTION_NAME(ns_check_sorted_list);
@@ -494,19 +492,15 @@ acpi_ns_check_sorted_list(struct acpi_predefined_data *data,
                /*
                 * The list must be sorted in the specified order. If we detect a
-                 * discrepancy, issue a warning and sort the entire list
+                 * discrepancy, sort the entire list.
                 */
                if (((sort_direction == ACPI_SORT_ASCENDING) &&
                     (obj_desc->integer.value < previous_value)) ||
                    ((sort_direction == ACPI_SORT_DESCENDING) &&
                     (obj_desc->integer.value > previous_value))) {
-                        status =
+                        acpi_ns_sort_list(return_object->package.elements,
-                            acpi_ns_sort_list(return_object->package.elements,
+                                          outer_element_count, sort_index,
-                                              outer_element_count, sort_index,
+                                          sort_direction);
-                                              sort_direction);
-                        if (ACPI_FAILURE(status)) {
-                                return (status);
-                        }
                        data->flags |= ACPI_OBJECT_REPAIRED;
@@ -525,89 +519,6 @@ acpi_ns_check_sorted_list(struct acpi_predefined_data *data,
 /******************************************************************************
 *
- * FUNCTION:    acpi_ns_remove_null_elements
- *
- * PARAMETERS:  Data                - Pointer to validation data structure
- *              package_type        - An acpi_return_package_types value
- *              obj_desc            - A Package object
- *
- * RETURN:      None.
- *
- * DESCRIPTION: Remove all NULL package elements from packages that contain
- *              a variable number of sub-packages.
- *
- *****************************************************************************/
-void
-acpi_ns_remove_null_elements(struct acpi_predefined_data *data,
-                             u8 package_type,
-                             union acpi_operand_object *obj_desc)
-{
-        union acpi_operand_object **source;
-        union acpi_operand_object **dest;
-        u32 count;
-        u32 new_count;
-        u32 i;
-        ACPI_FUNCTION_NAME(ns_remove_null_elements);
-        /*
-         * PTYPE1 packages contain no subpackages.
-         * PTYPE2 packages contain a variable number of sub-packages. We can
-         * safely remove all NULL elements from the PTYPE2 packages.
-         */
-        switch (package_type) {
-        case ACPI_PTYPE1_FIXED:
-        case ACPI_PTYPE1_VAR:
-        case ACPI_PTYPE1_OPTION:
-                return;
-        case ACPI_PTYPE2:
-        case ACPI_PTYPE2_COUNT:
-        case ACPI_PTYPE2_PKG_COUNT:
-        case ACPI_PTYPE2_FIXED:
-        case ACPI_PTYPE2_MIN:
-        case ACPI_PTYPE2_REV_FIXED:
-                break;
-        default:
-                return;
-        }
-        count = obj_desc->package.count;
-        new_count = count;
-        source = obj_desc->package.elements;
-        dest = source;
-        /* Examine all elements of the package object, remove nulls */
-        for (i = 0; i < count; i++) {
-                if (!*source) {
-                        new_count--;
-                } else {
-                        *dest = *source;
-                        dest++;
-                }
-                source++;
-        }
-        /* Update parent package if any null elements were removed */
-        if (new_count < count) {
-                ACPI_DEBUG_PRINT((ACPI_DB_REPAIR,
-                                  "%s: Found and removed %u NULL elements\n",
-                                  data->pathname, (count - new_count)));
-                /* NULL terminate list and update the package count */
-                *dest = NULL;
-                obj_desc->package.count = new_count;
-        }
-}
-/******************************************************************************
- *
 * FUNCTION:    acpi_ns_sort_list
 *
 * PARAMETERS:  Elements            - Package object element list
@@ -615,15 +526,16 @@ acpi_ns_remove_null_elements(struct acpi_predefined_data *data,
 *              Index               - Sort by which package element
 *              sort_direction      - Ascending or Descending sort
 *
- * RETURN:      Status
+ * RETURN:      None
 *
 * DESCRIPTION: Sort the objects that are in a package element list.
 *
- * NOTE: Assumes that all NULL elements have been removed from the package.
+ * NOTE: Assumes that all NULL elements have been removed from the package,
+ *       and that all elements have been verified to be of type Integer.
 *
 *****************************************************************************/
-static acpi_status
+static void
 acpi_ns_sort_list(union acpi_operand_object **elements,
                  u32 count, u32 index, u8 sort_direction)
 {
@@ -652,6 +564,4 @@ acpi_ns_sort_list(union acpi_operand_object **elements,
                        }
                }
        }
-        return (AE_OK);
 }
diff --git a/drivers/acpi/acpica/nssearch.c b/drivers/acpi/acpica/nssearch.c
index 7e865639a92..08f8b3f5cca 100644
--- a/drivers/acpi/acpica/nssearch.c
+++ b/drivers/acpi/acpica/nssearch.c
@@ -5,7 +5,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/nsutils.c b/drivers/acpi/acpica/nsutils.c
index 47d91e668a1..24d05a87a2a 100644
--- a/drivers/acpi/acpica/nsutils.c
+++ b/drivers/acpi/acpica/nsutils.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/nswalk.c b/drivers/acpi/acpica/nswalk.c
index d7e6b52b448..00e79fb2602 100644
--- a/drivers/acpi/acpica/nswalk.c
+++ b/drivers/acpi/acpica/nswalk.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/nsxfeval.c b/drivers/acpi/acpica/nsxfeval.c
index f0c0892bc7e..ebef8a7fd70 100644
--- a/drivers/acpi/acpica/nsxfeval.c
+++ b/drivers/acpi/acpica/nsxfeval.c
@@ -6,7 +6,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -562,25 +562,20 @@ acpi_ns_get_device_callback(acpi_handle obj_handle,
                return (AE_BAD_PARAMETER);
        }
-        /* Run _STA to determine if device is present */
+        /*
+         * First, filter based on the device HID and CID.
-        status = acpi_ut_execute_STA(node, &flags);
+         *
-        if (ACPI_FAILURE(status)) {
+         * 01/2010: For this case where a specific HID is requested, we don't
-                return (AE_CTRL_DEPTH);
+         * want to run _STA until we have an actual HID match. Thus, we will
-        }
+         * not unnecessarily execute _STA on devices for which the caller
+         * doesn't care about. Previously, _STA was executed unconditionally
-        if (!(flags & ACPI_STA_DEVICE_PRESENT) &&
+         * on all devices found here.
-            !(flags & ACPI_STA_DEVICE_FUNCTIONING)) {
+         *
-                /*
+         * A side-effect of this change is that now we will continue to search
-                 * Don't examine the children of the device only when the
+         * for a matching HID even under device trees where the parent device
-                 * device is neither present nor functional. See ACPI spec,
+         * would have returned a _STA that indicates it is not present or
-                 * description of _STA for more information.
+         * not functioning (thus aborting the search on that branch).
-                 */
+         */
-                return (AE_CTRL_DEPTH);
-        }
-        /* Filter based on device HID & CID */
        if (info->hid != NULL) {
                status = acpi_ut_execute_HID(node, &hid);
                if (status == AE_NOT_FOUND) {
@@ -620,6 +615,25 @@ acpi_ns_get_device_callback(acpi_handle obj_handle,
                }
        }
+        /* Run _STA to determine if device is present */
+        status = acpi_ut_execute_STA(node, &flags);
+        if (ACPI_FAILURE(status)) {
+                return (AE_CTRL_DEPTH);
+        }
+        if (!(flags & ACPI_STA_DEVICE_PRESENT) &&
+            !(flags & ACPI_STA_DEVICE_FUNCTIONING)) {
+                /*
+                 * Don't examine the children of the device only when the
+                 * device is neither present nor functional. See ACPI spec,
+                 * description of _STA for more information.
+                 */
+                return (AE_CTRL_DEPTH);
+        }
+        /* We have a valid device, invoke the user function */
        status = info->user_function(obj_handle, nesting_level, info->context,
                                     return_value);
        return (status);
diff --git a/drivers/acpi/acpica/nsxfname.c b/drivers/acpi/acpica/nsxfname.c
index e611dd961b2..b01e45a415e 100644
--- a/drivers/acpi/acpica/nsxfname.c
+++ b/drivers/acpi/acpica/nsxfname.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/nsxfobj.c b/drivers/acpi/acpica/nsxfobj.c
index 0cc6ba01a49..eafef24ea44 100644
--- a/drivers/acpi/acpica/nsxfobj.c
+++ b/drivers/acpi/acpica/nsxfobj.c
@@ -6,7 +6,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/psargs.c b/drivers/acpi/acpica/psargs.c
index b161f3544b5..00493e108a0 100644
--- a/drivers/acpi/acpica/psargs.c
+++ b/drivers/acpi/acpica/psargs.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -403,7 +403,7 @@ acpi_ps_get_next_simple_arg(struct acpi_parse_state *parser_state,
                /* Get 1 byte from the AML stream */
                opcode = AML_BYTE_OP;
-                arg->common.value.integer = (acpi_integer) * aml;
+                arg->common.value.integer = (u64) *aml;
                length = 1;
                break;
diff --git a/drivers/acpi/acpica/psloop.c b/drivers/acpi/acpica/psloop.c
index 0988e4a8901..59aabaeab1d 100644
--- a/drivers/acpi/acpica/psloop.c
+++ b/drivers/acpi/acpica/psloop.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/psopcode.c b/drivers/acpi/acpica/psopcode.c
index 3bc3a60194d..2b0c3be2b1b 100644
--- a/drivers/acpi/acpica/psopcode.c
+++ b/drivers/acpi/acpica/psopcode.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/psparse.c b/drivers/acpi/acpica/psparse.c
index 4df8f139026..8d81542194d 100644
--- a/drivers/acpi/acpica/psparse.c
+++ b/drivers/acpi/acpica/psparse.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/psscope.c b/drivers/acpi/acpica/psscope.c
index 2feca5ca958..40e2b279ea1 100644
--- a/drivers/acpi/acpica/psscope.c
+++ b/drivers/acpi/acpica/psscope.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/pstree.c b/drivers/acpi/acpica/pstree.c
index 4d3389118ec..d4b970c3630 100644
--- a/drivers/acpi/acpica/pstree.c
+++ b/drivers/acpi/acpica/pstree.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/psutils.c b/drivers/acpi/acpica/psutils.c
index e636e078ad3..fe29eee5adb 100644
--- a/drivers/acpi/acpica/psutils.c
+++ b/drivers/acpi/acpica/psutils.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/pswalk.c b/drivers/acpi/acpica/pswalk.c
index 78b8b791f2a..8abb9629443 100644
--- a/drivers/acpi/acpica/pswalk.c
+++ b/drivers/acpi/acpica/pswalk.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/psxface.c b/drivers/acpi/acpica/psxface.c
index d0c1b91eb8c..6064dd4e94c 100644
--- a/drivers/acpi/acpica/psxface.c
+++ b/drivers/acpi/acpica/psxface.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/rsaddr.c b/drivers/acpi/acpica/rsaddr.c
index 1e437bfd8db..226c806ae98 100644
--- a/drivers/acpi/acpica/rsaddr.c
+++ b/drivers/acpi/acpica/rsaddr.c
@@ -5,7 +5,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/rscalc.c b/drivers/acpi/acpica/rscalc.c
index 3c4dcc3d106..d6ebf7ec622 100644
--- a/drivers/acpi/acpica/rscalc.c
+++ b/drivers/acpi/acpica/rscalc.c
@@ -5,7 +5,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/rscreate.c b/drivers/acpi/acpica/rscreate.c
index a3c23d686d5..f2ee3b54860 100644
--- a/drivers/acpi/acpica/rscreate.c
+++ b/drivers/acpi/acpica/rscreate.c
@@ -5,7 +5,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -182,7 +182,7 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
        /*
         * Loop through the ACPI_INTERNAL_OBJECTS - Each object should be a
-         * package that in turn contains an acpi_integer Address, a u8 Pin,
+         * package that in turn contains an u64 Address, a u8 Pin,
         * a Name, and a u8 source_index.
         */
        top_object_list = package_object->package.elements;
diff --git a/drivers/acpi/acpica/rsdump.c b/drivers/acpi/acpica/rsdump.c
index 3f0ca5a12d3..f859b0386fe 100644
--- a/drivers/acpi/acpica/rsdump.c
+++ b/drivers/acpi/acpica/rsdump.c
@@ -5,7 +5,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/rsinfo.c b/drivers/acpi/acpica/rsinfo.c
index 77b25fdb459..1fd868b964f 100644
--- a/drivers/acpi/acpica/rsinfo.c
+++ b/drivers/acpi/acpica/rsinfo.c
@@ -5,7 +5,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/rsio.c b/drivers/acpi/acpica/rsio.c
index 35a49aa9560..33bff17c0bb 100644
--- a/drivers/acpi/acpica/rsio.c
+++ b/drivers/acpi/acpica/rsio.c
@@ -5,7 +5,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/rsirq.c b/drivers/acpi/acpica/rsirq.c
index 2e0256983aa..545da40d7fa 100644
--- a/drivers/acpi/acpica/rsirq.c
+++ b/drivers/acpi/acpica/rsirq.c
@@ -5,7 +5,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/rslist.c b/drivers/acpi/acpica/rslist.c
index 1b1dbc69f08..fd057c72d25 100644
--- a/drivers/acpi/acpica/rslist.c
+++ b/drivers/acpi/acpica/rslist.c
@@ -5,7 +5,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/rsmemory.c b/drivers/acpi/acpica/rsmemory.c
index ddc76cebdc9..887b8ba8c43 100644
--- a/drivers/acpi/acpica/rsmemory.c
+++ b/drivers/acpi/acpica/rsmemory.c
@@ -5,7 +5,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/rsmisc.c b/drivers/acpi/acpica/rsmisc.c
index 5bc49a55328..07de352fa44 100644
--- a/drivers/acpi/acpica/rsmisc.c
+++ b/drivers/acpi/acpica/rsmisc.c
@@ -5,7 +5,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/rsutils.c b/drivers/acpi/acpica/rsutils.c
index bc03d596682..22cfcfbd9ff 100644
--- a/drivers/acpi/acpica/rsutils.c
+++ b/drivers/acpi/acpica/rsutils.c
@@ -5,7 +5,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/rsxface.c b/drivers/acpi/acpica/rsxface.c
index f27feb4772f..9f6a6e7e1c8 100644
--- a/drivers/acpi/acpica/rsxface.c
+++ b/drivers/acpi/acpica/rsxface.c
@@ -5,7 +5,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/tbfadt.c b/drivers/acpi/acpica/tbfadt.c
index c016335fb75..f43fbe0fc3f 100644
--- a/drivers/acpi/acpica/tbfadt.c
+++ b/drivers/acpi/acpica/tbfadt.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/tbfind.c b/drivers/acpi/acpica/tbfind.c
index 1054dfd4920..e252180ce61 100644
--- a/drivers/acpi/acpica/tbfind.c
+++ b/drivers/acpi/acpica/tbfind.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/tbinstal.c b/drivers/acpi/acpica/tbinstal.c
index 63e82329a9e..7ec02b0f69e 100644
--- a/drivers/acpi/acpica/tbinstal.c
+++ b/drivers/acpi/acpica/tbinstal.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/tbutils.c b/drivers/acpi/acpica/tbutils.c
index 1f15497f00d..02723a9fb10 100644
--- a/drivers/acpi/acpica/tbutils.c
+++ b/drivers/acpi/acpica/tbutils.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/tbxface.c b/drivers/acpi/acpica/tbxface.c
index a88f02bd6c9..5217a6159a3 100644
--- a/drivers/acpi/acpica/tbxface.c
+++ b/drivers/acpi/acpica/tbxface.c
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/tbxfroot.c b/drivers/acpi/acpica/tbxfroot.c
index 85ea834199e..dda6e8c497d 100644
--- a/drivers/acpi/acpica/tbxfroot.c
+++ b/drivers/acpi/acpica/tbxfroot.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/utalloc.c b/drivers/acpi/acpica/utalloc.c
index 7580f6b3069..3d706b8fd44 100644
--- a/drivers/acpi/acpica/utalloc.c
+++ b/drivers/acpi/acpica/utalloc.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/utcopy.c b/drivers/acpi/acpica/utcopy.c
index f857c5efb79..97ec3621e71 100644
--- a/drivers/acpi/acpica/utcopy.c
+++ b/drivers/acpi/acpica/utcopy.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/utdebug.c b/drivers/acpi/acpica/utdebug.c
index 527d729f681..98351064005 100644
--- a/drivers/acpi/acpica/utdebug.c
+++ b/drivers/acpi/acpica/utdebug.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -460,8 +460,7 @@ ACPI_EXPORT_SYMBOL(acpi_ut_status_exit)
 void
 acpi_ut_value_exit(u32 line_number,
                   const char *function_name,
-                   const char *module_name,
+                   const char *module_name, u32 component_id, u64 value)
-                   u32 component_id, acpi_integer value)
 {
        acpi_debug_print(ACPI_LV_FUNCTIONS,
diff --git a/drivers/acpi/acpica/utdelete.c b/drivers/acpi/acpica/utdelete.c
index 96e26e70c63..16b51c69606 100644
--- a/drivers/acpi/acpica/utdelete.c
+++ b/drivers/acpi/acpica/utdelete.c
@@ -5,7 +5,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/uteval.c b/drivers/acpi/acpica/uteval.c
index 5d54e36ab45..7f5e734ce7f 100644
--- a/drivers/acpi/acpica/uteval.c
+++ b/drivers/acpi/acpica/uteval.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -348,7 +348,7 @@ acpi_ut_evaluate_object(struct acpi_namespace_node *prefix_node,
 acpi_status
 acpi_ut_evaluate_numeric_object(char *object_name,
                                struct acpi_namespace_node *device_node,
-                                acpi_integer *value)
+                                u64 *value)
 {
        union acpi_operand_object *obj_desc;
        acpi_status status;
diff --git a/drivers/acpi/acpica/utglobal.c b/drivers/acpi/acpica/utglobal.c
index 3f2c68f4e95..eda3e656c4a 100644
--- a/drivers/acpi/acpica/utglobal.c
+++ b/drivers/acpi/acpica/utglobal.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -234,7 +234,7 @@ static const char acpi_gbl_hex_to_ascii[] = {
 *
 ******************************************************************************/
-char acpi_ut_hex_to_ascii_char(acpi_integer integer, u32 position)
+char acpi_ut_hex_to_ascii_char(u64 integer, u32 position)
 {
        return (acpi_gbl_hex_to_ascii[(integer >> position) & 0xF]);
diff --git a/drivers/acpi/acpica/utids.c b/drivers/acpi/acpica/utids.c
index 52eaae40455..1397fadd0d4 100644
--- a/drivers/acpi/acpica/utids.c
+++ b/drivers/acpi/acpica/utids.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2009, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/utinit.c b/drivers/acpi/acpica/utinit.c
index 9d0919ebf7b..a39c93dac71 100644
--- a/drivers/acpi/acpica/utinit.c
+++ b/drivers/acpi/acpica/utinit.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/utlock.c b/drivers/acpi/acpica/utlock.c
index 25e03120686..b081cd46a15 100644
--- a/drivers/acpi/acpica/utlock.c
+++ b/drivers/acpi/acpica/utlock.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2009, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/utmath.c b/drivers/acpi/acpica/utmath.c
index c9f682d640e..35059a14eb7 100644
--- a/drivers/acpi/acpica/utmath.c
+++ b/drivers/acpi/acpica/utmath.c
@@ -5,7 +5,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -70,9 +70,8 @@ ACPI_MODULE_NAME("utmath")
 *
 ******************************************************************************/
 acpi_status
-acpi_ut_short_divide(acpi_integer dividend,
+acpi_ut_short_divide(u64 dividend,
-                     u32 divisor,
+                     u32 divisor, u64 *out_quotient, u32 *out_remainder)
-                     acpi_integer * out_quotient, u32 * out_remainder)
 {
        union uint64_overlay dividend_ovl;
        union uint64_overlay quotient;
@@ -126,9 +125,8 @@ acpi_ut_short_divide(acpi_integer dividend,
 ******************************************************************************/
 acpi_status
-acpi_ut_divide(acpi_integer in_dividend,
+acpi_ut_divide(u64 in_dividend,
-               acpi_integer in_divisor,
+               u64 in_divisor, u64 *out_quotient, u64 *out_remainder)
-               acpi_integer * out_quotient, acpi_integer * out_remainder)
 {
        union uint64_overlay dividend;
        union uint64_overlay divisor;
@@ -199,9 +197,8 @@ acpi_ut_divide(acpi_integer in_dividend,
                 * The 64-bit remainder must be generated.
                 */
                partial1 = quotient.part.lo * divisor.part.hi;
-                partial2.full =
+                partial2.full = (u64) quotient.part.lo * divisor.part.lo;
-                    (acpi_integer) quotient.part.lo * divisor.part.lo;
+                partial3.full = (u64) partial2.part.hi + partial1;
-                partial3.full = (acpi_integer) partial2.part.hi + partial1;
                remainder.part.hi = partial3.part.lo;
                remainder.part.lo = partial2.part.lo;
@@ -257,9 +254,8 @@ acpi_ut_divide(acpi_integer in_dividend,
 *
 ******************************************************************************/
 acpi_status
-acpi_ut_short_divide(acpi_integer in_dividend,
+acpi_ut_short_divide(u64 in_dividend,
-                     u32 divisor,
+                     u32 divisor, u64 *out_quotient, u32 *out_remainder)
-                     acpi_integer * out_quotient, u32 * out_remainder)
 {
        ACPI_FUNCTION_TRACE(ut_short_divide);
@@ -284,9 +280,8 @@ acpi_ut_short_divide(acpi_integer in_dividend,
 }
 acpi_status
-acpi_ut_divide(acpi_integer in_dividend,
+acpi_ut_divide(u64 in_dividend,
-               acpi_integer in_divisor,
+               u64 in_divisor, u64 *out_quotient, u64 *out_remainder)
-               acpi_integer * out_quotient, acpi_integer * out_remainder)
 {
        ACPI_FUNCTION_TRACE(ut_divide);
diff --git a/drivers/acpi/acpica/utmisc.c b/drivers/acpi/acpica/utmisc.c
index 6c6a5137b72..32982e2ac38 100644
--- a/drivers/acpi/acpica/utmisc.c
+++ b/drivers/acpi/acpica/utmisc.c
@@ -5,7 +5,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -724,13 +724,12 @@ acpi_name acpi_ut_repair_name(char *name)
 *
 ******************************************************************************/
-acpi_status
+acpi_status acpi_ut_strtoul64(char *string, u32 base, u64 * ret_integer)
-acpi_ut_strtoul64(char *string, u32 base, acpi_integer * ret_integer)
 {
        u32 this_digit = 0;
-        acpi_integer return_value = 0;
+        u64 return_value = 0;
-        acpi_integer quotient;
+        u64 quotient;
-        acpi_integer dividend;
+        u64 dividend;
        u32 to_integer_op = (base == ACPI_ANY_BASE);
        u32 mode32 = (acpi_gbl_integer_byte_width == 4);
        u8 valid_digits = 0;
@@ -844,9 +843,8 @@ acpi_ut_strtoul64(char *string, u32 base, acpi_integer * ret_integer)
                /* Divide the digit into the correct position */
-                (void)
+                (void)acpi_ut_short_divide((dividend - (u64) this_digit),
-                    acpi_ut_short_divide((dividend - (acpi_integer) this_digit),
+                                           base, &quotient, NULL);
-                                         base, &quotient, NULL);
                if (return_value > quotient) {
                        if (to_integer_op) {
diff --git a/drivers/acpi/acpica/utmutex.c b/drivers/acpi/acpica/utmutex.c
index 80bb6515411..55d014ed6d5 100644
--- a/drivers/acpi/acpica/utmutex.c
+++ b/drivers/acpi/acpica/utmutex.c
@@ -5,7 +5,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -50,7 +50,7 @@ ACPI_MODULE_NAME("utmutex")
 /* Local prototypes */
 static acpi_status acpi_ut_create_mutex(acpi_mutex_handle mutex_id);
-static acpi_status acpi_ut_delete_mutex(acpi_mutex_handle mutex_id);
+static void acpi_ut_delete_mutex(acpi_mutex_handle mutex_id);
 /*******************************************************************************
 *
@@ -114,7 +114,7 @@ void acpi_ut_mutex_terminate(void)
        /* Delete each predefined mutex object */
        for (i = 0; i < ACPI_NUM_MUTEX; i++) {
-                (void)acpi_ut_delete_mutex(i);
+                acpi_ut_delete_mutex(i);
        }
        /* Delete the spinlocks */
@@ -146,10 +146,6 @@ static acpi_status acpi_ut_create_mutex(acpi_mutex_handle mutex_id)
        ACPI_FUNCTION_TRACE_U32(ut_create_mutex, mutex_id);
-        if (mutex_id > ACPI_MAX_MUTEX) {
-                return_ACPI_STATUS(AE_BAD_PARAMETER);
-        }
        if (!acpi_gbl_mutex_info[mutex_id].mutex) {
                status =
                    acpi_os_create_mutex(&acpi_gbl_mutex_info[mutex_id].mutex);
@@ -173,21 +169,15 @@ static acpi_status acpi_ut_create_mutex(acpi_mutex_handle mutex_id)
 *
 ******************************************************************************/
-static acpi_status acpi_ut_delete_mutex(acpi_mutex_handle mutex_id)
+static void acpi_ut_delete_mutex(acpi_mutex_handle mutex_id)
 {
        ACPI_FUNCTION_TRACE_U32(ut_delete_mutex, mutex_id);
-        if (mutex_id > ACPI_MAX_MUTEX) {
-                return_ACPI_STATUS(AE_BAD_PARAMETER);
-        }
        acpi_os_delete_mutex(acpi_gbl_mutex_info[mutex_id].mutex);
        acpi_gbl_mutex_info[mutex_id].mutex = NULL;
        acpi_gbl_mutex_info[mutex_id].thread_id = ACPI_MUTEX_NOT_ACQUIRED;
-        return_ACPI_STATUS(AE_OK);
 }
 /*******************************************************************************
diff --git a/drivers/acpi/acpica/utobject.c b/drivers/acpi/acpica/utobject.c
index 42e658b543f..3356f0cb074 100644
--- a/drivers/acpi/acpica/utobject.c
+++ b/drivers/acpi/acpica/utobject.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/utresrc.c b/drivers/acpi/acpica/utresrc.c
index 91b7c00236f..7965919000b 100644
--- a/drivers/acpi/acpica/utresrc.c
+++ b/drivers/acpi/acpica/utresrc.c
@@ -5,7 +5,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/utstate.c b/drivers/acpi/acpica/utstate.c
index 0440c958f5a..d35d109b8da 100644
--- a/drivers/acpi/acpica/utstate.c
+++ b/drivers/acpi/acpica/utstate.c
@@ -5,7 +5,7 @@
 ******************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/utxface.c b/drivers/acpi/acpica/utxface.c
index b1f5f680bc7..db9d8ca5798 100644
--- a/drivers/acpi/acpica/utxface.c
+++ b/drivers/acpi/acpica/utxface.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2008, Intel Corp.
+ * Copyright (C) 2000 - 2010, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index cada73ffdfa..58d2c91ba62 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -324,8 +324,8 @@ static int extract_package(struct acpi_battery *battery,
                                strncpy(ptr, element->string.pointer, 32);
                        else if (element->type == ACPI_TYPE_INTEGER) {
                                strncpy(ptr, (u8 *)&element->integer.value,
-                                        sizeof(acpi_integer));
+                                        sizeof(u64));
-                                ptr[sizeof(acpi_integer)] = 0;
+                                ptr[sizeof(u64)] = 0;
                        } else
                                *ptr = 0; /* don't have value */
                } else {
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 27e0b92b2e3..d7a6bbbb834 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -597,7 +597,7 @@ static u32 acpi_ec_gpe_handler(void *data)
 static acpi_status
 acpi_ec_space_handler(u32 function, acpi_physical_address address,
-                      u32 bits, acpi_integer *value,
+                      u32 bits, u64 *value,
                      void *handler_context, void *region_context)
 {
        struct acpi_ec *ec = handler_context;
@@ -628,7 +628,7 @@ acpi_ec_space_handler(u32 function, acpi_physical_address address,
                ++address;
                if (function == ACPI_READ) {
                        result = acpi_ec_read(ec, address, &temp);
-                        (*value) |= ((acpi_integer)temp) << i;
+                        (*value) |= ((u64)temp) << i;
                } else {
                        temp = 0xff & ((*value) >> i);
                        result = acpi_ec_write(ec, address, temp);
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index 4c8fcff662c..6d5b64b7d52 100644
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -87,7 +87,7 @@ static int acpi_find_bridge_device(struct device *dev, acpi_handle * handle)
 /* Get device's handler per its address under its parent */
 struct acpi_find_child {
        acpi_handle handle;
-        acpi_integer address;
+        u64 address;
 };
 static acpi_status
@@ -106,7 +106,7 @@ do_acpi_find_child(acpi_handle handle, u32 lvl, void *context, void **rv)
        return AE_OK;
 }
-acpi_handle acpi_get_child(acpi_handle parent, acpi_integer address)
+acpi_handle acpi_get_child(acpi_handle parent, u64 address)
 {
        struct acpi_find_child find = { NULL, address };
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 02e8464e480..8e6d8665f0a 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -436,7 +436,7 @@ acpi_status acpi_os_remove_interrupt_handler(u32 irq, acpi_osd_handler handler)
 * Running in interpreter thread context, safe to sleep
 */
-void acpi_os_sleep(acpi_integer ms)
+void acpi_os_sleep(u64 ms)
 {
        schedule_timeout_interruptible(msecs_to_jiffies(ms));
 }
@@ -603,7 +603,7 @@ acpi_os_read_pci_configuration(struct acpi_pci_id * pci_id, u32 reg,
 acpi_status
 acpi_os_write_pci_configuration(struct acpi_pci_id * pci_id, u32 reg,
-                                acpi_integer value, u32 width)
+                                u64 value, u32 width)
 {
        int result, size;
diff --git a/drivers/acpi/power_meter.c b/drivers/acpi/power_meter.c
index dc4ffadf812..834c5af0de4 100644
--- a/drivers/acpi/power_meter.c
+++ b/drivers/acpi/power_meter.c
@@ -71,17 +71,17 @@ static const struct acpi_device_id power_meter_ids[] = {
 MODULE_DEVICE_TABLE(acpi, power_meter_ids);
 struct acpi_power_meter_capabilities {
-        acpi_integer            flags;
+        u64             flags;
-        acpi_integer            units;
+        u64             units;
-        acpi_integer            type;
+        u64             type;
-        acpi_integer            accuracy;
+        u64             accuracy;
-        acpi_integer            sampling_time;
+        u64             sampling_time;
-        acpi_integer            min_avg_interval;
+        u64             min_avg_interval;
-        acpi_integer            max_avg_interval;
+        u64             max_avg_interval;
-        acpi_integer            hysteresis;
+        u64             hysteresis;
-        acpi_integer            configurable_cap;
+        u64             configurable_cap;
-        acpi_integer            min_cap;
+        u64             min_cap;
-        acpi_integer            max_cap;
+        u64             max_cap;
 };
 struct acpi_power_meter_resource {
@@ -93,9 +93,9 @@ struct acpi_power_meter_resource {
        acpi_string             model_number;
        acpi_string             serial_number;
        acpi_string             oem_info;
-        acpi_integer            power;
+        u64             power;
-        acpi_integer            cap;
+        u64             cap;
-        acpi_integer            avg_interval;
+        u64             avg_interval;
        int                     sensors_valid;
        unsigned long           sensors_last_updated;
        struct sensor_device_attribute  sensors[NUM_SENSORS];
@@ -402,7 +402,7 @@ static ssize_t show_val(struct device *dev,
        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
        struct acpi_device *acpi_dev = to_acpi_device(dev);
        struct acpi_power_meter_resource *resource = acpi_dev->driver_data;
-        acpi_integer val = 0;
+        u64 val = 0;
        switch (attr->index) {
        case 0:
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index cc978a8c00b..37dfce74939 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -360,7 +360,7 @@ static int acpi_processor_get_power_info_default(struct acpi_processor *pr)
 static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)
 {
        acpi_status status = 0;
-        acpi_integer count;
+        u64 count;
        int current_count;
        int i;
        struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
diff --git a/drivers/acpi/processor_throttling.c b/drivers/acpi/processor_throttling.c
index 1c5d7a8b2fd..7ded7542fc9 100644
--- a/drivers/acpi/processor_throttling.c
+++ b/drivers/acpi/processor_throttling.c
@@ -660,7 +660,7 @@ static int acpi_processor_get_throttling_fadt(struct acpi_processor *pr)
 #ifdef CONFIG_X86
 static int acpi_throttling_rdmsr(struct acpi_processor *pr,
-                                        acpi_integer * value)
+                                        u64 *value)
 {
        struct cpuinfo_x86 *c;
        u64 msr_high, msr_low;
@@ -681,13 +681,13 @@ static int acpi_throttling_rdmsr(struct acpi_processor *pr,
                rdmsr_safe(MSR_IA32_THERM_CONTROL,
                        (u32 *)&msr_low , (u32 *) &msr_high);
                msr = (msr_high << 32) | msr_low;
-                *value = (acpi_integer) msr;
+                *value = (u64) msr;
                ret = 0;
        }
        return ret;
 }
-static int acpi_throttling_wrmsr(struct acpi_processor *pr, acpi_integer value)
+static int acpi_throttling_wrmsr(struct acpi_processor *pr, u64 value)
 {
        struct cpuinfo_x86 *c;
        unsigned int cpu;
@@ -711,14 +711,14 @@ static int acpi_throttling_wrmsr(struct acpi_processor *pr, acpi_integer value)
 }
 #else
 static int acpi_throttling_rdmsr(struct acpi_processor *pr,
-                                acpi_integer * value)
+                                u64 *value)
 {
        printk(KERN_ERR PREFIX
                "HARDWARE addr space,NOT supported yet\n");
        return -1;
 }
-static int acpi_throttling_wrmsr(struct acpi_processor *pr, acpi_integer value)
+static int acpi_throttling_wrmsr(struct acpi_processor *pr, u64 value)
 {
        printk(KERN_ERR PREFIX
                "HARDWARE addr space,NOT supported yet\n");
@@ -727,7 +727,7 @@ static int acpi_throttling_wrmsr(struct acpi_processor *pr, acpi_integer value)
 #endif
 static int acpi_read_throttling_status(struct acpi_processor *pr,
-                                        acpi_integer *value)
+                                        u64 *value)
 {
        u32 bit_width, bit_offset;
        u64 ptc_value;
@@ -746,7 +746,7 @@ static int acpi_read_throttling_status(struct acpi_processor *pr,
                                  address, (u32 *) &ptc_value,
                                  (u32) (bit_width + bit_offset));
                ptc_mask = (1 << bit_width) - 1;
-                *value = (acpi_integer) ((ptc_value >> bit_offset) & ptc_mask);
+                *value = (u64) ((ptc_value >> bit_offset) & ptc_mask);
                ret = 0;
                break;
        case ACPI_ADR_SPACE_FIXED_HARDWARE:
@@ -760,7 +760,7 @@ static int acpi_read_throttling_status(struct acpi_processor *pr,
 }
 static int acpi_write_throttling_state(struct acpi_processor *pr,
-                                acpi_integer value)
+                                u64 value)
 {
        u32 bit_width, bit_offset;
        u64 ptc_value;
@@ -793,7 +793,7 @@ static int acpi_write_throttling_state(struct acpi_processor *pr,
 }
 static int acpi_get_throttling_state(struct acpi_processor *pr,
-                                acpi_integer value)
+                                u64 value)
 {
        int i;
@@ -808,7 +808,7 @@ static int acpi_get_throttling_state(struct acpi_processor *pr,
 }
 static int acpi_get_throttling_value(struct acpi_processor *pr,
-                        int state, acpi_integer *value)
+                        int state, u64 *value)
 {
        int ret = -1;
@@ -826,7 +826,7 @@ static int acpi_processor_get_throttling_ptc(struct acpi_processor *pr)
 {
        int state = 0;
        int ret;
-        acpi_integer value;
+        u64 value;
        if (!pr)
                return -EINVAL;
@@ -993,7 +993,7 @@ static int acpi_processor_set_throttling_ptc(struct acpi_processor *pr,
                                             int state, bool force)
 {
        int ret;
-        acpi_integer value;
+        u64 value;
        if (!pr)
                return -EINVAL;
diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c
index 811fec10462..11882dbe209 100644
--- a/drivers/acpi/utils.c
+++ b/drivers/acpi/utils.c
@@ -107,12 +107,12 @@ acpi_extract_package(union acpi_object *package,
                case ACPI_TYPE_INTEGER:
                        switch (format_string[i]) {
                        case 'N':
-                                size_required += sizeof(acpi_integer);
+                                size_required += sizeof(u64);
-                                tail_offset += sizeof(acpi_integer);
+                                tail_offset += sizeof(u64);
                                break;
                        case 'S':
                                size_required +=
-                                    sizeof(char *) + sizeof(acpi_integer) +
+                                    sizeof(char *) + sizeof(u64) +
                                    sizeof(char);
                                tail_offset += sizeof(char *);
                                break;
@@ -193,17 +193,17 @@ acpi_extract_package(union acpi_object *package,
                case ACPI_TYPE_INTEGER:
                        switch (format_string[i]) {
                        case 'N':
-                                *((acpi_integer *) head) =
+                                *((u64 *) head) =
                                    element->integer.value;
-                                head += sizeof(acpi_integer);
+                                head += sizeof(u64);
                                break;
                        case 'S':
                                pointer = (u8 **) head;
                                *pointer = tail;
-                                *((acpi_integer *) tail) =
+                                *((u64 *) tail) =
                                    element->integer.value;
-                                head += sizeof(acpi_integer *);
+                                head += sizeof(u64 *);
-                                tail += sizeof(acpi_integer);
+                                tail += sizeof(u64);
                                /* NULL terminate string */
                                *tail = (char)0;
                                tail += sizeof(char);
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index b765790b32b..6e9b49149fc 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -759,7 +759,7 @@ acpi_video_bus_POST_options(struct acpi_video_bus *video,
 static int
 acpi_video_bus_DOS(struct acpi_video_bus *video, int bios_flag, int lcd_flag)
 {
-        acpi_integer status = 0;
+        u64 status = 0;
        union acpi_object arg0 = { ACPI_TYPE_INTEGER };
        struct acpi_object_list args = { 1, &arg0 };
diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c
index 1245838ac13..292fdbc0431 100644
--- a/drivers/ata/libata-acpi.c
+++ b/drivers/ata/libata-acpi.c
@@ -64,7 +64,7 @@ void ata_acpi_associate_sata_port(struct ata_port *ap)
        WARN_ON(!(ap->flags & ATA_FLAG_ACPI_SATA));
        if (!sata_pmp_attached(ap)) {
-                acpi_integer adr = SATA_ADR(ap->port_no, NO_PORT_MULT);
+                u64 adr = SATA_ADR(ap->port_no, NO_PORT_MULT);
                ap->link.device->acpi_handle =
                        acpi_get_child(ap->host->acpi_handle, adr);
@@ -74,7 +74,7 @@ void ata_acpi_associate_sata_port(struct ata_port *ap)
                ap->link.device->acpi_handle = NULL;
                ata_for_each_link(link, ap, EDGE) {
-                        acpi_integer adr = SATA_ADR(ap->port_no, link->pmp);
+                        u64 adr = SATA_ADR(ap->port_no, link->pmp);
                        link->device->acpi_handle =
                                acpi_get_child(ap->host->acpi_handle, adr);
diff --git a/drivers/char/keyboard.c b/drivers/char/keyboard.c
index f706b1dffdb..ada25bb8941 100644
--- a/drivers/char/keyboard.c
+++ b/drivers/char/keyboard.c
@@ -1185,11 +1185,6 @@ static void kbd_keycode(unsigned int keycode, int down, int hw_raw)
        rep = (down == 2);
-#ifdef CONFIG_MAC_EMUMOUSEBTN
-        if (mac_hid_mouse_emulate_buttons(1, keycode, down))
-                return;
-#endif /* CONFIG_MAC_EMUMOUSEBTN */
        if ((raw_mode = (kbd->kbdmode == VC_RAW)) && !hw_raw)
                if (emulate_raw(vc, keycode, !down << 7))
                        if (keycode < BTN_MISC && printk_ratelimit())
@@ -1328,6 +1323,21 @@ static void kbd_event(struct input_handle *handle, unsigned int event_type,
        schedule_console_callback();
 }
+static bool kbd_match(struct input_handler *handler, struct input_dev *dev)
+{
+        int i;
+        if (test_bit(EV_SND, dev->evbit))
+                return true;
+        if (test_bit(EV_KEY, dev->evbit))
+                for (i = KEY_RESERVED; i < BTN_MISC; i++)
+                        if (test_bit(i, dev->keybit))
+                                return true;
+        return false;
+}
 /*
 * When a keyboard (or other input device) is found, the kbd_connect
 * function is called. The function then looks at the device, and if it
@@ -1339,14 +1349,6 @@ static int kbd_connect(struct input_handler *handler, struct input_dev *dev,
 {
        struct input_handle *handle;
        int error;
-        int i;
-        for (i = KEY_RESERVED; i < BTN_MISC; i++)
-                if (test_bit(i, dev->keybit))
-                        break;
-        if (i == BTN_MISC && !test_bit(EV_SND, dev->evbit))
-                return -ENODEV;
        handle = kzalloc(sizeof(struct input_handle), GFP_KERNEL);
        if (!handle)
@@ -1412,6 +1414,7 @@ MODULE_DEVICE_TABLE(input, kbd_ids);
 static struct input_handler kbd_handler = {
        .event          = kbd_event,
+        .match          = kbd_match,
        .connect        = kbd_connect,
        .disconnect     = kbd_disconnect,
        .start          = kbd_start,
diff --git a/drivers/ide/ide-acpi.c b/drivers/ide/ide-acpi.c
index c0cf45a11b9..5cb01e5c323 100644
--- a/drivers/ide/ide-acpi.c
+++ b/drivers/ide/ide-acpi.c
@@ -108,11 +108,11 @@ bool ide_port_acpi(ide_hwif_t *hwif)
 * Returns 0 on success, <0 on error.
 */
 static int ide_get_dev_handle(struct device *dev, acpi_handle *handle,
-                               acpi_integer *pcidevfn)
+                               u64 *pcidevfn)
 {
        struct pci_dev *pdev = to_pci_dev(dev);
        unsigned int bus, devnum, func;
-        acpi_integer addr;
+        u64 addr;
        acpi_handle dev_handle;
        acpi_status status;
        struct acpi_device_info *dinfo = NULL;
@@ -122,7 +122,7 @@ static int ide_get_dev_handle(struct device *dev, acpi_handle *handle,
        devnum = PCI_SLOT(pdev->devfn);
        func = PCI_FUNC(pdev->devfn);
        /* ACPI _ADR encoding for PCI bus: */
-        addr = (acpi_integer)(devnum << 16 | func);
+        addr = (u64)(devnum << 16 | func);
        DEBPRINT("ENTER: pci %02x:%02x.%01x\n", bus, devnum, func);
@@ -169,7 +169,7 @@ static acpi_handle ide_acpi_hwif_get_handle(ide_hwif_t *hwif)
 {
        struct device           *dev = hwif->gendev.parent;
        acpi_handle             uninitialized_var(dev_handle);
-        acpi_integer            pcidevfn;
+        u64                     pcidevfn;
        acpi_handle             chan_handle;
        int                     err;
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index 258c639571b..9f9816baeb9 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -278,6 +278,8 @@ static int evdev_open(struct inode *inode, struct file *file)
                goto err_free_client;
        file->private_data = client;
+        nonseekable_open(inode, file);
        return 0;
 err_free_client:
diff --git a/drivers/input/gameport/emu10k1-gp.c b/drivers/input/gameport/emu10k1-gp.c
index b04930f7ea7..7392992da42 100644
--- a/drivers/input/gameport/emu10k1-gp.c
+++ b/drivers/input/gameport/emu10k1-gp.c
@@ -46,7 +46,7 @@ struct emu {
        int size;
 };
-static struct pci_device_id emu_tbl[] = {
+static const struct pci_device_id emu_tbl[] = {
        { 0x1102, 0x7002, PCI_ANY_ID, PCI_ANY_ID }, /* SB Live gameport */
        { 0x1102, 0x7003, PCI_ANY_ID, PCI_ANY_ID }, /* Audigy gameport */
diff --git a/drivers/input/gameport/fm801-gp.c b/drivers/input/gameport/fm801-gp.c
index 8a1810f88b9..14d3f3e208a 100644
--- a/drivers/input/gameport/fm801-gp.c
+++ b/drivers/input/gameport/fm801-gp.c
@@ -140,7 +140,7 @@ static void __devexit fm801_gp_remove(struct pci_dev *pci)
        }
 }
-static struct pci_device_id fm801_gp_id_table[] = {
+static const struct pci_device_id fm801_gp_id_table[] = {
        { PCI_VENDOR_ID_FORTEMEDIA, PCI_DEVICE_ID_FM801_GP, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0  },
        { 0 }
 };
diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
index ac11be08585..7e18bcf05a6 100644
--- a/drivers/input/gameport/gameport.c
+++ b/drivers/input/gameport/gameport.c
@@ -11,6 +11,8 @@
 * the Free Software Foundation.
 */
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 #include <linux/stddef.h>
 #include <linux/module.h>
 #include <linux/ioport.h>
@@ -190,9 +192,8 @@ static int gameport_bind_driver(struct gameport *gameport, struct gameport_drive
        error = device_bind_driver(&gameport->dev);
        if (error) {
-                printk(KERN_WARNING
+                dev_warn(&gameport->dev,
-                        "gameport: device_bind_driver() failed "
+                         "device_bind_driver() failed for %s (%s) and %s, error: %d\n",
-                        "for %s (%s) and %s, error: %d\n",
                        gameport->phys, gameport->name,
                        drv->description, error);
                drv->disconnect(gameport);
@@ -209,9 +210,9 @@ static void gameport_find_driver(struct gameport *gameport)
        error = device_attach(&gameport->dev);
        if (error < 0)
-                printk(KERN_WARNING
+                dev_warn(&gameport->dev,
-                        "gameport: device_attach() failed for %s (%s), error: %d\n",
+                         "device_attach() failed for %s (%s), error: %d\n",
-                        gameport->phys, gameport->name, error);
+                         gameport->phys, gameport->name, error);
 }
@@ -262,17 +263,14 @@ static int gameport_queue_event(void *object, struct module *owner,
        event = kmalloc(sizeof(struct gameport_event), GFP_ATOMIC);
        if (!event) {
-                printk(KERN_ERR
+                pr_err("Not enough memory to queue event %d\n", event_type);
-                        "gameport: Not enough memory to queue event %d\n",
-                        event_type);
                retval = -ENOMEM;
                goto out;
        }
        if (!try_module_get(owner)) {
-                printk(KERN_WARNING
+                pr_warning("Can't get module reference, dropping event %d\n",
-                        "gameport: Can't get module reference, dropping event %d\n",
+                           event_type);
-                        event_type);
                kfree(event);
                retval = -EINVAL;
                goto out;
@@ -298,14 +296,12 @@ static void gameport_free_event(struct gameport_event *event)
 static void gameport_remove_duplicate_events(struct gameport_event *event)
 {
-        struct list_head *node, *next;
+        struct gameport_event *e, *next;
-        struct gameport_event *e;
        unsigned long flags;
        spin_lock_irqsave(&gameport_event_lock, flags);
-        list_for_each_safe(node, next, &gameport_event_list) {
+        list_for_each_entry_safe(e, next, &gameport_event_list, node) {
-                e = list_entry(node, struct gameport_event, node);
                if (event->object == e->object) {
                        /*
                         * If this event is of different type we should not
@@ -315,7 +311,7 @@ static void gameport_remove_duplicate_events(struct gameport_event *event)
                        if (event->type != e->type)
                                break;
-                        list_del_init(node);
+                        list_del_init(&e->node);
                        gameport_free_event(e);
                }
        }
@@ -325,23 +321,18 @@ static void gameport_remove_duplicate_events(struct gameport_event *event)
 static struct gameport_event *gameport_get_event(void)
 {
-        struct gameport_event *event;
+        struct gameport_event *event = NULL;
-        struct list_head *node;
        unsigned long flags;
        spin_lock_irqsave(&gameport_event_lock, flags);
-        if (list_empty(&gameport_event_list)) {
+        if (!list_empty(&gameport_event_list)) {
-                spin_unlock_irqrestore(&gameport_event_lock, flags);
+                event = list_first_entry(&gameport_event_list,
-                return NULL;
+                                         struct gameport_event, node);
+                list_del_init(&event->node);
        }
-        node = gameport_event_list.next;
-        event = list_entry(node, struct gameport_event, node);
-        list_del_init(node);
        spin_unlock_irqrestore(&gameport_event_lock, flags);
        return event;
 }
@@ -360,16 +351,14 @@ static void gameport_handle_event(void)
        if ((event = gameport_get_event())) {
                switch (event->type) {
-                        case GAMEPORT_REGISTER_PORT:
-                                gameport_add_port(event->object);
-                                break;
-                        case GAMEPORT_ATTACH_DRIVER:
+                case GAMEPORT_REGISTER_PORT:
-                                gameport_attach_driver(event->object);
+                        gameport_add_port(event->object);
-                                break;
+                        break;
-                        default:
+                case GAMEPORT_ATTACH_DRIVER:
-                                break;
+                        gameport_attach_driver(event->object);
+                        break;
                }
                gameport_remove_duplicate_events(event);
@@ -385,16 +374,14 @@ static void gameport_handle_event(void)
 */
 static void gameport_remove_pending_events(void *object)
 {
-        struct list_head *node, *next;
+        struct gameport_event *event, *next;
-        struct gameport_event *event;
        unsigned long flags;
        spin_lock_irqsave(&gameport_event_lock, flags);
-        list_for_each_safe(node, next, &gameport_event_list) {
+        list_for_each_entry_safe(event, next, &gameport_event_list, node) {
-                event = list_entry(node, struct gameport_event, node);
                if (event->object == object) {
-                        list_del_init(node);
+                        list_del_init(&event->node);
                        gameport_free_event(event);
                }
        }
@@ -441,7 +428,6 @@ static int gameport_thread(void *nothing)
                        kthread_should_stop() || !list_empty(&gameport_event_list));
        } while (!kthread_should_stop());
-        printk(KERN_DEBUG "gameport: kgameportd exiting\n");
        return 0;
 }
@@ -453,6 +439,7 @@ static int gameport_thread(void *nothing)
 static ssize_t gameport_show_description(struct device *dev, struct device_attribute *attr, char *buf)
 {
        struct gameport *gameport = to_gameport_port(dev);
        return sprintf(buf, "%s\n", gameport->name);
 }
@@ -521,7 +508,8 @@ static void gameport_init_port(struct gameport *gameport)
        mutex_init(&gameport->drv_mutex);
        device_initialize(&gameport->dev);
-        dev_set_name(&gameport->dev, "gameport%lu", (unsigned long)atomic_inc_return(&gameport_no) - 1);
+        dev_set_name(&gameport->dev, "gameport%lu",
+                        (unsigned long)atomic_inc_return(&gameport_no) - 1);
        gameport->dev.bus = &gameport_bus;
        gameport->dev.release = gameport_release_port;
        if (gameport->parent)
@@ -550,19 +538,17 @@ static void gameport_add_port(struct gameport *gameport)
        list_add_tail(&gameport->node, &gameport_list);
        if (gameport->io)
-                printk(KERN_INFO "gameport: %s is %s, io %#x, speed %dkHz\n",
+                dev_info(&gameport->dev, "%s is %s, io %#x, speed %dkHz\n",
-                        gameport->name, gameport->phys, gameport->io, gameport->speed);
+                         gameport->name, gameport->phys, gameport->io, gameport->speed);
        else
-                printk(KERN_INFO "gameport: %s is %s, speed %dkHz\n",
+                dev_info(&gameport->dev, "%s is %s, speed %dkHz\n",
                        gameport->name, gameport->phys, gameport->speed);
        error = device_add(&gameport->dev);
        if (error)
-                printk(KERN_ERR
+                dev_err(&gameport->dev,
-                        "gameport: device_add() failed for %s (%s), error: %d\n",
+                        "device_add() failed for %s (%s), error: %d\n",
                        gameport->phys, gameport->name, error);
-        else
-                gameport->registered = 1;
 }
 /*
@@ -584,10 +570,8 @@ static void gameport_destroy_port(struct gameport *gameport)
                gameport->parent = NULL;
        }
-        if (gameport->registered) {
+        if (device_is_registered(&gameport->dev))
                device_del(&gameport->dev);
-                gameport->registered = 0;
-        }
        list_del_init(&gameport->node);
@@ -705,8 +689,7 @@ static void gameport_attach_driver(struct gameport_driver *drv)
        error = driver_attach(&drv->driver);
        if (error)
-                printk(KERN_ERR
+                pr_err("driver_attach() failed for %s, error: %d\n",
-                        "gameport: driver_attach() failed for %s, error: %d\n",
                        drv->driver.name, error);
 }
@@ -727,8 +710,7 @@ int __gameport_register_driver(struct gameport_driver *drv, struct module *owner
        error = driver_register(&drv->driver);
        if (error) {
-                printk(KERN_ERR
+                pr_err("driver_register() failed for %s, error: %d\n",
-                        "gameport: driver_register() failed for %s, error: %d\n",
                        drv->driver.name, error);
                return error;
        }
@@ -828,7 +810,7 @@ static int __init gameport_init(void)
        error = bus_register(&gameport_bus);
        if (error) {
-                printk(KERN_ERR "gameport: failed to register gameport bus, error: %d\n", error);
+                pr_err("failed to register gameport bus, error: %d\n", error);
                return error;
        }
@@ -836,7 +818,7 @@ static int __init gameport_init(void)
        if (IS_ERR(gameport_task)) {
                bus_unregister(&gameport_bus);
                error = PTR_ERR(gameport_task);
-                printk(KERN_ERR "gameport: Failed to start kgameportd, error: %d\n", error);
+                pr_err("Failed to start kgameportd, error: %d\n", error);
                return error;
        }
diff --git a/drivers/input/gameport/ns558.c b/drivers/input/gameport/ns558.c
index db556b71ddd..7c217848613 100644
--- a/drivers/input/gameport/ns558.c
+++ b/drivers/input/gameport/ns558.c
@@ -166,7 +166,7 @@ static int ns558_isa_probe(int io)
 #ifdef CONFIG_PNP
-static struct pnp_device_id pnp_devids[] = {
+static const struct pnp_device_id pnp_devids[] = {
        { .id = "@P@0001", .driver_data = 0 }, /* ALS 100 */
        { .id = "@P@0020", .driver_data = 0 }, /* ALS 200 */
        { .id = "@P@1001", .driver_data = 0 }, /* ALS 100+ */
diff --git a/drivers/input/input-compat.h b/drivers/input/input-compat.h
index 47cd9eaee66..4d8ea32e8a0 100644
--- a/drivers/input/input-compat.h
+++ b/drivers/input/input-compat.h
@@ -21,8 +21,6 @@
   you why the ifdefs are needed? Think about it again. -AK */
 #ifdef CONFIG_X86_64
 #  define INPUT_COMPAT_TEST is_compat_task()
-#elif defined(CONFIG_IA64)
-#  define INPUT_COMPAT_TEST IS_IA32_PROCESS(task_pt_regs(current))
 #elif defined(CONFIG_S390)
 #  define INPUT_COMPAT_TEST test_thread_flag(TIF_31BIT)
 #elif defined(CONFIG_MIPS)
diff --git a/drivers/input/input.c b/drivers/input/input.c
index 86cb2d2196f..41168d5f8c1 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -87,12 +87,14 @@ static int input_defuzz_abs_event(int value, int old_val, int fuzz)
 }
 /*
- * Pass event through all open handles. This function is called with
+ * Pass event first through all filters and then, if event has not been
+ * filtered out, through all open handles. This function is called with
 * dev->event_lock held and interrupts disabled.
 */
 static void input_pass_event(struct input_dev *dev,
                             unsigned int type, unsigned int code, int value)
 {
+        struct input_handler *handler;
        struct input_handle *handle;
        rcu_read_lock();
@@ -100,11 +102,25 @@ static void input_pass_event(struct input_dev *dev,
        handle = rcu_dereference(dev->grab);
        if (handle)
                handle->handler->event(handle, type, code, value);
-        else
+        else {
-                list_for_each_entry_rcu(handle, &dev->h_list, d_node)
+                bool filtered = false;
-                        if (handle->open)
-                                handle->handler->event(handle,
+                list_for_each_entry_rcu(handle, &dev->h_list, d_node) {
-                                                        type, code, value);
+                        if (!handle->open)
+                                continue;
+                        handler = handle->handler;
+                        if (!handler->filter) {
+                                if (filtered)
+                                        break;
+                                handler->event(handle, type, code, value);
+                        } else if (handler->filter(handle, type, code, value))
+                                filtered = true;
+                }
+        }
        rcu_read_unlock();
 }
@@ -615,12 +631,12 @@ static int input_default_setkeycode(struct input_dev *dev,
                }
        }
-        clear_bit(old_keycode, dev->keybit);
+        __clear_bit(old_keycode, dev->keybit);
-        set_bit(keycode, dev->keybit);
+        __set_bit(keycode, dev->keybit);
        for (i = 0; i < dev->keycodemax; i++) {
                if (input_fetch_keycode(dev, i) == old_keycode) {
-                        set_bit(old_keycode, dev->keybit);
+                        __set_bit(old_keycode, dev->keybit);
                        break; /* Setting the bit twice is useless, so break */
                }
        }
@@ -678,6 +694,9 @@ int input_set_keycode(struct input_dev *dev, int scancode, int keycode)
        if (retval)
                goto out;
+        /* Make sure KEY_RESERVED did not get enabled. */
+        __clear_bit(KEY_RESERVED, dev->keybit);
        /*
         * Simulate keyup event if keycode is not present
         * in the keymap anymore
@@ -705,12 +724,13 @@ EXPORT_SYMBOL(input_set_keycode);
                if (i != BITS_TO_LONGS(max)) \
                        continue;
-static const struct input_device_id *input_match_device(const struct input_device_id *id,
+static const struct input_device_id *input_match_device(struct input_handler *handler,
                                                        struct input_dev *dev)
 {
+        const struct input_device_id *id;
        int i;
-        for (; id->flags || id->driver_info; id++) {
+        for (id = handler->id_table; id->flags || id->driver_info; id++) {
                if (id->flags & INPUT_DEVICE_ID_MATCH_BUS)
                        if (id->bustype != dev->id.bustype)
@@ -738,7 +758,8 @@ static const struct input_device_id *input_match_device(const struct input_devic
                MATCH_BIT(ffbit,  FF_MAX);
                MATCH_BIT(swbit,  SW_MAX);
-                return id;
+                if (!handler->match || handler->match(handler, dev))
+                        return id;
        }
        return NULL;
@@ -749,10 +770,7 @@ static int input_attach_handler(struct input_dev *dev, struct input_handler *han
        const struct input_device_id *id;
        int error;
-        if (handler->blacklist && input_match_device(handler->blacklist, dev))
+        id = input_match_device(handler, dev);
-                return -ENODEV;
-        id = input_match_device(handler->id_table, dev);
        if (!id)
                return -ENODEV;
@@ -988,6 +1006,8 @@ static int input_handlers_seq_show(struct seq_file *seq, void *v)
        union input_seq_state *state = (union input_seq_state *)&seq->private;
        seq_printf(seq, "N: Number=%u Name=%s", state->pos, handler->name);
+        if (handler->filter)
+                seq_puts(seq, " (filter)");
        if (handler->fops)
                seq_printf(seq, " Minor=%d", handler->minor);
        seq_putc(seq, '\n');
@@ -1551,6 +1571,25 @@ void input_set_capability(struct input_dev *dev, unsigned int type, unsigned int
 }
 EXPORT_SYMBOL(input_set_capability);
+#define INPUT_CLEANSE_BITMASK(dev, type, bits)                          \
+        do {                                                            \
+                if (!test_bit(EV_##type, dev->evbit))                   \
+                        memset(dev->bits##bit, 0,                       \
+                                sizeof(dev->bits##bit));                \
+        } while (0)
+static void input_cleanse_bitmasks(struct input_dev *dev)
+{
+        INPUT_CLEANSE_BITMASK(dev, KEY, key);
+        INPUT_CLEANSE_BITMASK(dev, REL, rel);
+        INPUT_CLEANSE_BITMASK(dev, ABS, abs);
+        INPUT_CLEANSE_BITMASK(dev, MSC, msc);
+        INPUT_CLEANSE_BITMASK(dev, LED, led);
+        INPUT_CLEANSE_BITMASK(dev, SND, snd);
+        INPUT_CLEANSE_BITMASK(dev, FF, ff);
+        INPUT_CLEANSE_BITMASK(dev, SW, sw);
+}
 /**
 * input_register_device - register device with input core
 * @dev: device to be registered
@@ -1570,13 +1609,19 @@ int input_register_device(struct input_dev *dev)
        const char *path;
        int error;
+        /* Every input device generates EV_SYN/SYN_REPORT events. */
        __set_bit(EV_SYN, dev->evbit);
+        /* KEY_RESERVED is not supposed to be transmitted to userspace. */
+        __clear_bit(KEY_RESERVED, dev->keybit);
+        /* Make sure that bitmasks not mentioned in dev->evbit are clean. */
+        input_cleanse_bitmasks(dev);
        /*
         * If delay and period are pre-set by the driver, then autorepeating
         * is handled by the driver itself and we don't do it in input.c.
         */
        init_timer(&dev->timer);
        if (!dev->rep[REP_DELAY] && !dev->rep[REP_PERIOD]) {
                dev->timer.data = (long) dev;
@@ -1776,7 +1821,16 @@ int input_register_handle(struct input_handle *handle)
        error = mutex_lock_interruptible(&dev->mutex);
        if (error)
                return error;
-        list_add_tail_rcu(&handle->d_node, &dev->h_list);
+        /*
+         * Filters go to the head of the list, normal handlers
+         * to the tail.
+         */
+        if (handler->filter)
+                list_add_rcu(&handle->d_node, &dev->h_list);
+        else
+                list_add_tail_rcu(&handle->d_node, &dev->h_list);
        mutex_unlock(&dev->mutex);
        /*
diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c
index b1bd6dd3228..c52bec4d053 100644
--- a/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
@@ -286,6 +286,8 @@ static int joydev_open(struct inode *inode, struct file *file)
                goto err_free_client;
        file->private_data = client;
+        nonseekable_open(inode, file);
        return 0;
 err_free_client:
@@ -775,6 +777,20 @@ static void joydev_cleanup(struct joydev *joydev)
                input_close_device(handle);
 }
+static bool joydev_match(struct input_handler *handler, struct input_dev *dev)
+{
+        /* Avoid touchpads and touchscreens */
+        if (test_bit(EV_KEY, dev->evbit) && test_bit(BTN_TOUCH, dev->keybit))
+                return false;
+        /* Avoid tablets, digitisers and similar devices */
+        if (test_bit(EV_KEY, dev->evbit) && test_bit(BTN_DIGI, dev->keybit))
+                return false;
+        return true;
+}
 static int joydev_connect(struct input_handler *handler, struct input_dev *dev,
                          const struct input_device_id *id)
 {
@@ -894,22 +910,6 @@ static void joydev_disconnect(struct input_handle *handle)
        put_device(&joydev->dev);
 }
-static const struct input_device_id joydev_blacklist[] = {
-        {
-                .flags = INPUT_DEVICE_ID_MATCH_EVBIT |
-                                INPUT_DEVICE_ID_MATCH_KEYBIT,
-                .evbit = { BIT_MASK(EV_KEY) },
-                .keybit = { [BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH) },
-        },      /* Avoid itouchpads and touchscreens */
-        {
-                .flags = INPUT_DEVICE_ID_MATCH_EVBIT |
-                                INPUT_DEVICE_ID_MATCH_KEYBIT,
-                .evbit = { BIT_MASK(EV_KEY) },
-                .keybit = { [BIT_WORD(BTN_DIGI)] = BIT_MASK(BTN_DIGI) },
-        },      /* Avoid tablets, digitisers and similar devices */
-        { }     /* Terminating entry */
-};
 static const struct input_device_id joydev_ids[] = {
        {
                .flags = INPUT_DEVICE_ID_MATCH_EVBIT |
@@ -936,13 +936,13 @@ MODULE_DEVICE_TABLE(input, joydev_ids);
 static struct input_handler joydev_handler = {
        .event          = joydev_event,
+        .match          = joydev_match,
        .connect        = joydev_connect,
        .disconnect     = joydev_disconnect,
        .fops           = &joydev_fops,
        .minor          = JOYDEV_MINOR_BASE,
        .name           = "joydev",
        .id_table       = joydev_ids,
-        .blacklist      = joydev_blacklist,
 };
 static int __init joydev_init(void)
diff --git a/drivers/input/joystick/Kconfig b/drivers/input/joystick/Kconfig
index b11419590cf..5b596165b57 100644
--- a/drivers/input/joystick/Kconfig
+++ b/drivers/input/joystick/Kconfig
@@ -221,6 +221,7 @@ config JOYSTICK_DB9
 config JOYSTICK_GAMECON
        tristate "Multisystem, NES, SNES, N64, PSX joysticks and gamepads"
        depends on PARPORT
+        select INPUT_FF_MEMLESS
        ---help---
          Say Y here if you have a Nintendo Entertainment System gamepad,
          Super Nintendo Entertainment System gamepad, Nintendo 64 gamepad,
diff --git a/drivers/input/joystick/gamecon.c b/drivers/input/joystick/gamecon.c
index 07a32aff5a3..ae998d99a5a 100644
--- a/drivers/input/joystick/gamecon.c
+++ b/drivers/input/joystick/gamecon.c
@@ -30,6 +30,8 @@
 * Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic
 */
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 #include <linux/kernel.h>
 #include <linux/delay.h>
 #include <linux/module.h>
@@ -61,48 +63,73 @@ MODULE_PARM_DESC(map3, "Describes third set of devices");
 /* see also gs_psx_delay parameter in PSX support section */
-#define GC_SNES         1
+enum gc_type {
-#define GC_NES          2
+        GC_NONE = 0,
-#define GC_NES4         3
+        GC_SNES,
-#define GC_MULTI        4
+        GC_NES,
-#define GC_MULTI2       5
+        GC_NES4,
-#define GC_N64          6
+        GC_MULTI,
-#define GC_PSX          7
+        GC_MULTI2,
-#define GC_DDR          8
+        GC_N64,
-#define GC_SNESMOUSE    9
+        GC_PSX,
+        GC_DDR,
-#define GC_MAX          9
+        GC_SNESMOUSE,
+        GC_MAX
+};
 #define GC_REFRESH_TIME HZ/100
+struct gc_pad {
+        struct input_dev *dev;
+        enum gc_type type;
+        char phys[32];
+};
 struct gc {
        struct pardevice *pd;
+        struct gc_pad pads[GC_MAX_DEVICES];
        struct input_dev *dev[GC_MAX_DEVICES];
        struct timer_list timer;
-        unsigned char pads[GC_MAX + 1];
+        int pad_count[GC_MAX];
        int used;
        struct mutex mutex;
-        char phys[GC_MAX_DEVICES][32];
+};
+struct gc_subdev {
+        unsigned int idx;
 };
 static struct gc *gc_base[3];
-static int gc_status_bit[] = { 0x40, 0x80, 0x20, 0x10, 0x08 };
+static const int gc_status_bit[] = { 0x40, 0x80, 0x20, 0x10, 0x08 };
+static const char *gc_names[] = {
+        NULL, "SNES pad", "NES pad", "NES FourPort", "Multisystem joystick",
+        "Multisystem 2-button joystick", "N64 controller", "PSX controller",
+        "PSX DDR controller", "SNES mouse"
+};
-static char *gc_names[] = { NULL, "SNES pad", "NES pad", "NES FourPort", "Multisystem joystick",
-                                "Multisystem 2-button joystick", "N64 controller", "PSX controller",
-                                "PSX DDR controller", "SNES mouse" };
 /*
 * N64 support.
 */
-static unsigned char gc_n64_bytes[] = { 0, 1, 13, 15, 14, 12, 10, 11, 2, 3 };
+static const unsigned char gc_n64_bytes[] = { 0, 1, 13, 15, 14, 12, 10, 11, 2, 3 };
-static short gc_n64_btn[] = { BTN_A, BTN_B, BTN_C, BTN_X, BTN_Y, BTN_Z, BTN_TL, BTN_TR, BTN_TRIGGER, BTN_START };
+static const short gc_n64_btn[] = {
+        BTN_A, BTN_B, BTN_C, BTN_X, BTN_Y, BTN_Z,
+        BTN_TL, BTN_TR, BTN_TRIGGER, BTN_START
+};
 #define GC_N64_LENGTH           32              /* N64 bit length, not including stop bit */
-#define GC_N64_REQUEST_LENGTH   37              /* transmit request sequence is 9 bits long */
+#define GC_N64_STOP_LENGTH      5               /* Length of encoded stop bit */
+#define GC_N64_CMD_00           0x11111111UL
+#define GC_N64_CMD_01           0xd1111111UL
+#define GC_N64_CMD_03           0xdd111111UL
+#define GC_N64_CMD_1b           0xdd1dd111UL
+#define GC_N64_CMD_c0           0x111111ddUL
+#define GC_N64_CMD_80           0x1111111dUL
+#define GC_N64_STOP_BIT         0x1d            /* Encoded stop bit */
+#define GC_N64_REQUEST_DATA     GC_N64_CMD_01   /* the request data command */
 #define GC_N64_DELAY            133             /* delay between transmit request, and response ready (us) */
-#define GC_N64_REQUEST          0x1dd1111111ULL /* the request data command (encoded for 000000011) */
 #define GC_N64_DWS              3               /* delay between write segments (required for sound playback because of ISA DMA) */
                                                /* GC_N64_DWS > 24 is known to fail */
 #define GC_N64_POWER_W          0xe2            /* power during write (transmit request) */
@@ -114,8 +141,40 @@ static short gc_n64_btn[] = { BTN_A, BTN_B, BTN_C, BTN_X, BTN_Y, BTN_Z, BTN_TL,
 #define GC_N64_CLOCK            0x02            /* clock bits for read */
 /*
+ * Used for rumble code.
+ */
+/* Send encoded command */
+static void gc_n64_send_command(struct gc *gc, unsigned long cmd,
+                                unsigned char target)
+{
+        struct parport *port = gc->pd->port;
+        int i;
+        for (i = 0; i < GC_N64_LENGTH; i++) {
+                unsigned char data = (cmd >> i) & 1 ? target : 0;
+                parport_write_data(port, GC_N64_POWER_W | data);
+                udelay(GC_N64_DWS);
+        }
+}
+/* Send stop bit */
+static void gc_n64_send_stop_bit(struct gc *gc, unsigned char target)
+{
+        struct parport *port = gc->pd->port;
+        int i;
+        for (i = 0; i < GC_N64_STOP_LENGTH; i++) {
+                unsigned char data = (GC_N64_STOP_BIT >> i) & 1 ? target : 0;
+                parport_write_data(port, GC_N64_POWER_W | data);
+                udelay(GC_N64_DWS);
+        }
+}
+/*
 * gc_n64_read_packet() reads an N64 packet.
- * Each pad uses one bit per byte. So all pads connected to this port are read in parallel.
+ * Each pad uses one bit per byte. So all pads connected to this port
+ * are read in parallel.
 */
 static void gc_n64_read_packet(struct gc *gc, unsigned char *data)
@@ -128,14 +187,13 @@ static void gc_n64_read_packet(struct gc *gc, unsigned char *data)
 */
        local_irq_save(flags);
-        for (i = 0; i < GC_N64_REQUEST_LENGTH; i++) {
+        gc_n64_send_command(gc, GC_N64_REQUEST_DATA, GC_N64_OUT);
-                parport_write_data(gc->pd->port, GC_N64_POWER_W | ((GC_N64_REQUEST >> i) & 1 ? GC_N64_OUT : 0));
+        gc_n64_send_stop_bit(gc, GC_N64_OUT);
-                udelay(GC_N64_DWS);
-        }
        local_irq_restore(flags);
 /*
- * Wait for the pad response to be loaded into the 33-bit register of the adapter
+ * Wait for the pad response to be loaded into the 33-bit register
+ * of the adapter.
 */
        udelay(GC_N64_DELAY);
@@ -146,13 +204,15 @@ static void gc_n64_read_packet(struct gc *gc, unsigned char *data)
        for (i = 0; i < GC_N64_LENGTH; i++) {
                parport_write_data(gc->pd->port, GC_N64_POWER_R);
+                udelay(2);
                data[i] = parport_read_status(gc->pd->port);
                parport_write_data(gc->pd->port, GC_N64_POWER_R | GC_N64_CLOCK);
         }
 /*
- * We must wait 200 ms here for the controller to reinitialize before the next read request.
+ * We must wait 200 ms here for the controller to reinitialize before
- * No worries as long as gc_read is polled less frequently than this.
+ * the next read request. No worries as long as gc_read is polled less
+ * frequently than this.
 */
 }
@@ -160,45 +220,112 @@ static void gc_n64_read_packet(struct gc *gc, unsigned char *data)
 static void gc_n64_process_packet(struct gc *gc)
 {
        unsigned char data[GC_N64_LENGTH];
-        signed char axes[2];
        struct input_dev *dev;
        int i, j, s;
+        signed char x, y;
        gc_n64_read_packet(gc, data);
        for (i = 0; i < GC_MAX_DEVICES; i++) {
-                dev = gc->dev[i];
+                if (gc->pads[i].type != GC_N64)
-                if (!dev)
                        continue;
+                dev = gc->pads[i].dev;
                s = gc_status_bit[i];
-                if (s & gc->pads[GC_N64] & ~(data[8] | data[9])) {
+                if (s & ~(data[8] | data[9])) {
-                        axes[0] = axes[1] = 0;
+                        x = y = 0;
                        for (j = 0; j < 8; j++) {
                                if (data[23 - j] & s)
-                                        axes[0] |= 1 << j;
+                                        x |= 1 << j;
                                if (data[31 - j] & s)
-                                        axes[1] |= 1 << j;
+                                        y |= 1 << j;
                        }
-                        input_report_abs(dev, ABS_X,  axes[0]);
+                        input_report_abs(dev, ABS_X,  x);
-                        input_report_abs(dev, ABS_Y, -axes[1]);
+                        input_report_abs(dev, ABS_Y, -y);
-                        input_report_abs(dev, ABS_HAT0X, !(s & data[6]) - !(s & data[7]));
+                        input_report_abs(dev, ABS_HAT0X,
-                        input_report_abs(dev, ABS_HAT0Y, !(s & data[4]) - !(s & data[5]));
+                                         !(s & data[6]) - !(s & data[7]));
+                        input_report_abs(dev, ABS_HAT0Y,
+                                         !(s & data[4]) - !(s & data[5]));
                        for (j = 0; j < 10; j++)
-                                input_report_key(dev, gc_n64_btn[j], s & data[gc_n64_bytes[j]]);
+                                input_report_key(dev, gc_n64_btn[j],
+                                                 s & data[gc_n64_bytes[j]]);
                        input_sync(dev);
                }
        }
 }
+static int gc_n64_play_effect(struct input_dev *dev, void *data,
+                              struct ff_effect *effect)
+{
+        int i;
+        unsigned long flags;
+        struct gc *gc = input_get_drvdata(dev);
+        struct gc_subdev *sdev = data;
+        unsigned char target = 1 << sdev->idx; /* select desired pin */
+        if (effect->type == FF_RUMBLE) {
+                struct ff_rumble_effect *rumble = &effect->u.rumble;
+                unsigned int cmd =
+                        rumble->strong_magnitude || rumble->weak_magnitude ?
+                        GC_N64_CMD_01 : GC_N64_CMD_00;
+                local_irq_save(flags);
+                /* Init Rumble - 0x03, 0x80, 0x01, (34)0x80 */
+                gc_n64_send_command(gc, GC_N64_CMD_03, target);
+                gc_n64_send_command(gc, GC_N64_CMD_80, target);
+                gc_n64_send_command(gc, GC_N64_CMD_01, target);
+                for (i = 0; i < 32; i++)
+                        gc_n64_send_command(gc, GC_N64_CMD_80, target);
+                gc_n64_send_stop_bit(gc, target);
+                udelay(GC_N64_DELAY);
+                /* Now start or stop it - 0x03, 0xc0, 0zx1b, (32)0x01/0x00 */
+                gc_n64_send_command(gc, GC_N64_CMD_03, target);
+                gc_n64_send_command(gc, GC_N64_CMD_c0, target);
+                gc_n64_send_command(gc, GC_N64_CMD_1b, target);
+                for (i = 0; i < 32; i++)
+                        gc_n64_send_command(gc, cmd, target);
+                gc_n64_send_stop_bit(gc, target);
+                local_irq_restore(flags);
+        }
+        return 0;
+}
+static int __init gc_n64_init_ff(struct input_dev *dev, int i)
+{
+        struct gc_subdev *sdev;
+        int err;
+        sdev = kmalloc(sizeof(*sdev), GFP_KERNEL);
+        if (!sdev)
+                return -ENOMEM;
+        sdev->idx = i;
+        input_set_capability(dev, EV_FF, FF_RUMBLE);
+        err = input_ff_create_memless(dev, sdev, gc_n64_play_effect);
+        if (err) {
+                kfree(sdev);
+                return err;
+        }
+        return 0;
+}
 /*
 * NES/SNES support.
 */
@@ -214,9 +341,11 @@ static void gc_n64_process_packet(struct gc *gc)
 #define GC_NES_CLOCK    0x01
 #define GC_NES_LATCH    0x02
-static unsigned char gc_nes_bytes[] = { 0, 1, 2, 3 };
+static const unsigned char gc_nes_bytes[] = { 0, 1, 2, 3 };
-static unsigned char gc_snes_bytes[] = { 8, 0, 2, 3, 9, 1, 10, 11 };
+static const unsigned char gc_snes_bytes[] = { 8, 0, 2, 3, 9, 1, 10, 11 };
-static short gc_snes_btn[] = { BTN_A, BTN_B, BTN_SELECT, BTN_START, BTN_X, BTN_Y, BTN_TL, BTN_TR };
+static const short gc_snes_btn[] = {
+        BTN_A, BTN_B, BTN_SELECT, BTN_START, BTN_X, BTN_Y, BTN_TL, BTN_TR
+};
 /*
 * gc_nes_read_packet() reads a NES/SNES packet.
@@ -244,40 +373,51 @@ static void gc_nes_read_packet(struct gc *gc, int length, unsigned char *data)
 static void gc_nes_process_packet(struct gc *gc)
 {
        unsigned char data[GC_SNESMOUSE_LENGTH];
+        struct gc_pad *pad;
        struct input_dev *dev;
        int i, j, s, len;
        char x_rel, y_rel;
-        len = gc->pads[GC_SNESMOUSE] ? GC_SNESMOUSE_LENGTH :
+        len = gc->pad_count[GC_SNESMOUSE] ? GC_SNESMOUSE_LENGTH :
-                        (gc->pads[GC_SNES] ? GC_SNES_LENGTH : GC_NES_LENGTH);
+                        (gc->pad_count[GC_SNES] ? GC_SNES_LENGTH : GC_NES_LENGTH);
        gc_nes_read_packet(gc, len, data);
        for (i = 0; i < GC_MAX_DEVICES; i++) {
+                pad = &gc->pads[i];
                dev = gc->dev[i];
-                if (!dev)
-                        continue;
                s = gc_status_bit[i];
-                if (s & (gc->pads[GC_NES] | gc->pads[GC_SNES])) {
+                switch (pad->type) {
+                case GC_NES:
                        input_report_abs(dev, ABS_X, !(s & data[6]) - !(s & data[7]));
                        input_report_abs(dev, ABS_Y, !(s & data[4]) - !(s & data[5]));
-                }
-                if (s & gc->pads[GC_NES])
                        for (j = 0; j < 4; j++)
-                                input_report_key(dev, gc_snes_btn[j], s & data[gc_nes_bytes[j]]);
+                                input_report_key(dev, gc_snes_btn[j],
+                                                 s & data[gc_nes_bytes[j]]);
+                        input_sync(dev);
+                        break;
+                case GC_SNES:
+                        input_report_abs(dev, ABS_X, !(s & data[6]) - !(s & data[7]));
+                        input_report_abs(dev, ABS_Y, !(s & data[4]) - !(s & data[5]));
-                if (s & gc->pads[GC_SNES])
                        for (j = 0; j < 8; j++)
-                                input_report_key(dev, gc_snes_btn[j], s & data[gc_snes_bytes[j]]);
+                                input_report_key(dev, gc_snes_btn[j],
+                                                 s & data[gc_snes_bytes[j]]);
+                        input_sync(dev);
+                        break;
-                if (s & gc->pads[GC_SNESMOUSE]) {
+                case GC_SNESMOUSE:
                        /*
-                         * The 4 unused bits from SNES controllers appear to be ID bits
+                         * The 4 unused bits from SNES controllers appear
-                         * so use them to make sure iwe are dealing with a mouse.
+                         * to be ID bits so use them to make sure we are
+                         * dealing with a mouse.
                         * gamepad is connected. This is important since
                         * my SNES gamepad sends 1's for bits 16-31, which
                         * cause the mouse pointer to quickly move to the
@@ -310,9 +450,14 @@ static void gc_nes_process_packet(struct gc *gc)
                                                y_rel = -y_rel;
                                        input_report_rel(dev, REL_Y, y_rel);
                                }
+                                input_sync(dev);
                        }
+                        break;
+                default:
+                        break;
                }
-                input_sync(dev);
        }
 }
@@ -340,29 +485,35 @@ static void gc_multi_read_packet(struct gc *gc, int length, unsigned char *data)
 static void gc_multi_process_packet(struct gc *gc)
 {
        unsigned char data[GC_MULTI2_LENGTH];
+        int data_len = gc->pad_count[GC_MULTI2] ? GC_MULTI2_LENGTH : GC_MULTI_LENGTH;
+        struct gc_pad *pad;
        struct input_dev *dev;
        int i, s;
-        gc_multi_read_packet(gc, gc->pads[GC_MULTI2] ? GC_MULTI2_LENGTH : GC_MULTI_LENGTH, data);
+        gc_multi_read_packet(gc, data_len, data);
        for (i = 0; i < GC_MAX_DEVICES; i++) {
+                pad = &gc->pads[i];
-                dev = gc->dev[i];
+                dev = pad->dev;
-                if (!dev)
-                        continue;
                s = gc_status_bit[i];
-                if (s & (gc->pads[GC_MULTI] | gc->pads[GC_MULTI2])) {
+                switch (pad->type) {
-                        input_report_abs(dev, ABS_X,  !(s & data[2]) - !(s & data[3]));
+                case GC_MULTI2:
-                        input_report_abs(dev, ABS_Y,  !(s & data[0]) - !(s & data[1]));
-                        input_report_key(dev, BTN_TRIGGER, s & data[4]);
-                }
-                if (s & gc->pads[GC_MULTI2])
                        input_report_key(dev, BTN_THUMB, s & data[5]);
+                        /* fall through */
-                input_sync(dev);
+                case GC_MULTI:
+                        input_report_abs(dev, ABS_X,
+                                         !(s & data[2]) - !(s & data[3]));
+                        input_report_abs(dev, ABS_Y,
+                                         !(s & data[0]) - !(s & data[1]));
+                        input_report_key(dev, BTN_TRIGGER, s & data[4]);
+                        input_sync(dev);
+                        break;
+                default:
+                        break;
+                }
        }
 }
@@ -398,30 +549,41 @@ static int gc_psx_delay = GC_PSX_DELAY;
 module_param_named(psx_delay, gc_psx_delay, uint, 0);
 MODULE_PARM_DESC(psx_delay, "Delay when accessing Sony PSX controller (usecs)");
-static short gc_psx_abs[] = { ABS_X, ABS_Y, ABS_RX, ABS_RY, ABS_HAT0X, ABS_HAT0Y };
+static const short gc_psx_abs[] = {
-static short gc_psx_btn[] = { BTN_TL, BTN_TR, BTN_TL2, BTN_TR2, BTN_A, BTN_B, BTN_X, BTN_Y,
+        ABS_X, ABS_Y, ABS_RX, ABS_RY, ABS_HAT0X, ABS_HAT0Y
-                                BTN_START, BTN_SELECT, BTN_THUMBL, BTN_THUMBR };
+};
-static short gc_psx_ddr_btn[] = { BTN_0, BTN_1, BTN_2, BTN_3 };
+static const short gc_psx_btn[] = {
+        BTN_TL, BTN_TR, BTN_TL2, BTN_TR2, BTN_A, BTN_B, BTN_X, BTN_Y,
+        BTN_START, BTN_SELECT, BTN_THUMBL, BTN_THUMBR
+};
+static const short gc_psx_ddr_btn[] = { BTN_0, BTN_1, BTN_2, BTN_3 };
 /*
 * gc_psx_command() writes 8bit command and reads 8bit data from
 * the psx pad.
 */
-static void gc_psx_command(struct gc *gc, int b, unsigned char data[GC_MAX_DEVICES])
+static void gc_psx_command(struct gc *gc, int b, unsigned char *data)
 {
+        struct parport *port = gc->pd->port;
        int i, j, cmd, read;
-        for (i = 0; i < GC_MAX_DEVICES; i++)
+        memset(data, 0, GC_MAX_DEVICES);
-                data[i] = 0;
        for (i = 0; i < GC_PSX_LENGTH; i++, b >>= 1) {
                cmd = (b & 1) ? GC_PSX_COMMAND : 0;
-                parport_write_data(gc->pd->port, cmd | GC_PSX_POWER);
+                parport_write_data(port, cmd | GC_PSX_POWER);
                udelay(gc_psx_delay);
-                read = parport_read_status(gc->pd->port) ^ 0x80;
-                for (j = 0; j < GC_MAX_DEVICES; j++)
+                read = parport_read_status(port) ^ 0x80;
-                        data[j] |= (read & gc_status_bit[j] & (gc->pads[GC_PSX] | gc->pads[GC_DDR])) ? (1 << i) : 0;
+                for (j = 0; j < GC_MAX_DEVICES; j++) {
+                        struct gc_pad *pad = &gc->pads[i];
+                        if (pad->type == GC_PSX || pad->type == GC_DDR)
+                                data[j] |= (read & gc_status_bit[j]) ? (1 << i) : 0;
+                }
                parport_write_data(gc->pd->port, cmd | GC_PSX_CLOCK | GC_PSX_POWER);
                udelay(gc_psx_delay);
        }
@@ -432,31 +594,40 @@ static void gc_psx_command(struct gc *gc, int b, unsigned char data[GC_MAX_DEVIC
 * device identifier code.
 */
-static void gc_psx_read_packet(struct gc *gc, unsigned char data[GC_MAX_DEVICES][GC_PSX_BYTES],
+static void gc_psx_read_packet(struct gc *gc,
+                               unsigned char data[GC_MAX_DEVICES][GC_PSX_BYTES],
                               unsigned char id[GC_MAX_DEVICES])
 {
        int i, j, max_len = 0;
        unsigned long flags;
        unsigned char data2[GC_MAX_DEVICES];
-        parport_write_data(gc->pd->port, GC_PSX_CLOCK | GC_PSX_SELECT | GC_PSX_POWER);  /* Select pad */
+        /* Select pad */
+        parport_write_data(gc->pd->port, GC_PSX_CLOCK | GC_PSX_SELECT | GC_PSX_POWER);
        udelay(gc_psx_delay);
-        parport_write_data(gc->pd->port, GC_PSX_CLOCK | GC_PSX_POWER);                  /* Deselect, begin command */
+        /* Deselect, begin command */
+        parport_write_data(gc->pd->port, GC_PSX_CLOCK | GC_PSX_POWER);
        udelay(gc_psx_delay);
        local_irq_save(flags);
-        gc_psx_command(gc, 0x01, data2);                                                /* Access pad */
+        gc_psx_command(gc, 0x01, data2);        /* Access pad */
-        gc_psx_command(gc, 0x42, id);                                                   /* Get device ids */
+        gc_psx_command(gc, 0x42, id);           /* Get device ids */
-        gc_psx_command(gc, 0, data2);                                                   /* Dump status */
+        gc_psx_command(gc, 0, data2);           /* Dump status */
+        /* Find the longest pad */
+        for (i = 0; i < GC_MAX_DEVICES; i++) {
+                struct gc_pad *pad = &gc->pads[i];
-        for (i =0; i < GC_MAX_DEVICES; i++)                                                             /* Find the longest pad */
+                if ((pad->type == GC_PSX || pad->type == GC_DDR) &&
-                if((gc_status_bit[i] & (gc->pads[GC_PSX] | gc->pads[GC_DDR]))
+                    GC_PSX_LEN(id[i]) > max_len &&
-                        && (GC_PSX_LEN(id[i]) > max_len)
+                    GC_PSX_LEN(id[i]) <= GC_PSX_BYTES) {
-                        && (GC_PSX_LEN(id[i]) <= GC_PSX_BYTES))
                        max_len = GC_PSX_LEN(id[i]);
+                }
+        }
-        for (i = 0; i < max_len; i++) {                                         /* Read in all the data */
+        /* Read in all the data */
+        for (i = 0; i < max_len; i++) {
                gc_psx_command(gc, 0, data2);
                for (j = 0; j < GC_MAX_DEVICES; j++)
                        data[j][i] = data2[j];
@@ -466,86 +637,104 @@ static void gc_psx_read_packet(struct gc *gc, unsigned char data[GC_MAX_DEVICES]
        parport_write_data(gc->pd->port, GC_PSX_CLOCK | GC_PSX_SELECT | GC_PSX_POWER);
-        for(i = 0; i < GC_MAX_DEVICES; i++)                                                             /* Set id's to the real value */
+        /* Set id's to the real value */
+        for (i = 0; i < GC_MAX_DEVICES; i++)
                id[i] = GC_PSX_ID(id[i]);
 }
-static void gc_psx_process_packet(struct gc *gc)
+static void gc_psx_report_one(struct gc_pad *pad, unsigned char psx_type,
+                              unsigned char *data)
 {
-        unsigned char data[GC_MAX_DEVICES][GC_PSX_BYTES];
+        struct input_dev *dev = pad->dev;
-        unsigned char id[GC_MAX_DEVICES];
+        int i;
-        struct input_dev *dev;
-        int i, j;
-        gc_psx_read_packet(gc, data, id);
+        switch (psx_type) {
-        for (i = 0; i < GC_MAX_DEVICES; i++) {
+        case GC_PSX_RUMBLE:
-                dev = gc->dev[i];
+                input_report_key(dev, BTN_THUMBL, ~data[0] & 0x04);
-                if (!dev)
+                input_report_key(dev, BTN_THUMBR, ~data[0] & 0x02);
-                        continue;
-                switch (id[i]) {
+        case GC_PSX_NEGCON:
+        case GC_PSX_ANALOG:
-                        case GC_PSX_RUMBLE:
+                if (pad->type == GC_DDR) {
+                        for (i = 0; i < 4; i++)
+                                input_report_key(dev, gc_psx_ddr_btn[i],
+                                                 ~data[0] & (0x10 << i));
+                } else {
+                        for (i = 0; i < 4; i++)
+                                input_report_abs(dev, gc_psx_abs[i + 2],
+                                                 data[i + 2]);
-                                input_report_key(dev, BTN_THUMBL, ~data[i][0] & 0x04);
+                        input_report_abs(dev, ABS_X,
-                                input_report_key(dev, BTN_THUMBR, ~data[i][0] & 0x02);
+                                !!(data[0] & 0x80) * 128 + !(data[0] & 0x20) * 127);
+                        input_report_abs(dev, ABS_Y,
+                                !!(data[0] & 0x10) * 128 + !(data[0] & 0x40) * 127);
+                }
-                        case GC_PSX_NEGCON:
+                for (i = 0; i < 8; i++)
-                        case GC_PSX_ANALOG:
+                        input_report_key(dev, gc_psx_btn[i], ~data[1] & (1 << i));
-                                if (gc->pads[GC_DDR] & gc_status_bit[i]) {
+                input_report_key(dev, BTN_START,  ~data[0] & 0x08);
-                                        for(j = 0; j < 4; j++)
+                input_report_key(dev, BTN_SELECT, ~data[0] & 0x01);
-                                                input_report_key(dev, gc_psx_ddr_btn[j], ~data[i][0] & (0x10 << j));
-                                } else {
-                                        for (j = 0; j < 4; j++)
-                                                input_report_abs(dev, gc_psx_abs[j + 2], data[i][j + 2]);
-                                        input_report_abs(dev, ABS_X, 128 + !(data[i][0] & 0x20) * 127 - !(data[i][0] & 0x80) * 128);
+                input_sync(dev);
-                                        input_report_abs(dev, ABS_Y, 128 + !(data[i][0] & 0x40) * 127 - !(data[i][0] & 0x10) * 128);
-                                }
-                                for (j = 0; j < 8; j++)
+                break;
-                                        input_report_key(dev, gc_psx_btn[j], ~data[i][1] & (1 << j));
-                                input_report_key(dev, BTN_START,  ~data[i][0] & 0x08);
+        case GC_PSX_NORMAL:
-                                input_report_key(dev, BTN_SELECT, ~data[i][0] & 0x01);
-                                input_sync(dev);
+                if (pad->type == GC_DDR) {
+                        for (i = 0; i < 4; i++)
+                                input_report_key(dev, gc_psx_ddr_btn[i],
+                                                 ~data[0] & (0x10 << i));
+                } else {
+                        input_report_abs(dev, ABS_X,
+                                !!(data[0] & 0x80) * 128 + !(data[0] & 0x20) * 127);
+                        input_report_abs(dev, ABS_Y,
+                                !!(data[0] & 0x10) * 128 + !(data[0] & 0x40) * 127);
-                                break;
+                        /*
+                         * For some reason if the extra axes are left unset
-                        case GC_PSX_NORMAL:
+                         * they drift.
-                                if (gc->pads[GC_DDR] & gc_status_bit[i]) {
+                         * for (i = 0; i < 4; i++)
-                                        for(j = 0; j < 4; j++)
+                                input_report_abs(dev, gc_psx_abs[i + 2], 128);
-                                                input_report_key(dev, gc_psx_ddr_btn[j], ~data[i][0] & (0x10 << j));
+                         * This needs to be debugged properly,
-                                } else {
+                         * maybe fuzz processing needs to be done
-                                        input_report_abs(dev, ABS_X, 128 + !(data[i][0] & 0x20) * 127 - !(data[i][0] & 0x80) * 128);
+                         * in input_sync()
-                                        input_report_abs(dev, ABS_Y, 128 + !(data[i][0] & 0x40) * 127 - !(data[i][0] & 0x10) * 128);
+                         *                               --vojtech
+                         */
-                                        /* for some reason if the extra axes are left unset they drift */
+                }
-                                        /* for (j = 0; j < 4; j++)
-                                                input_report_abs(dev, gc_psx_abs[j + 2], 128);
-                                         * This needs to be debugged properly,
-                                         * maybe fuzz processing needs to be done in input_sync()
-                                         *                               --vojtech
-                                         */
-                                }
-                                for (j = 0; j < 8; j++)
+                for (i = 0; i < 8; i++)
-                                        input_report_key(dev, gc_psx_btn[j], ~data[i][1] & (1 << j));
+                        input_report_key(dev, gc_psx_btn[i], ~data[1] & (1 << i));
-                                input_report_key(dev, BTN_START,  ~data[i][0] & 0x08);
+                input_report_key(dev, BTN_START,  ~data[0] & 0x08);
-                                input_report_key(dev, BTN_SELECT, ~data[i][0] & 0x01);
+                input_report_key(dev, BTN_SELECT, ~data[0] & 0x01);
-                                input_sync(dev);
+                input_sync(dev);
-                                break;
+                break;
-                        case 0: /* not a pad, ignore */
+        default: /* not a pad, ignore */
-                                break;
+                break;
-                }
+        }
+}
+static void gc_psx_process_packet(struct gc *gc)
+{
+        unsigned char data[GC_MAX_DEVICES][GC_PSX_BYTES];
+        unsigned char id[GC_MAX_DEVICES];
+        struct gc_pad *pad;
+        int i;
+        gc_psx_read_packet(gc, data, id);
+        for (i = 0; i < GC_MAX_DEVICES; i++) {
+                pad = &gc->pads[i];
+                if (pad->type == GC_PSX || pad->type == GC_DDR)
+                        gc_psx_report_one(pad, id[i], data[i]);
        }
 }
@@ -561,28 +750,31 @@ static void gc_timer(unsigned long private)
 * N64 pads - must be read first, any read confuses them for 200 us
 */
-        if (gc->pads[GC_N64])
+        if (gc->pad_count[GC_N64])
                gc_n64_process_packet(gc);
 /*
 * NES and SNES pads or mouse
 */
-        if (gc->pads[GC_NES] || gc->pads[GC_SNES] || gc->pads[GC_SNESMOUSE])
+        if (gc->pad_count[GC_NES] ||
+            gc->pad_count[GC_SNES] ||
+            gc->pad_count[GC_SNESMOUSE]) {
                gc_nes_process_packet(gc);
+        }
 /*
 * Multi and Multi2 joysticks
 */
-        if (gc->pads[GC_MULTI] || gc->pads[GC_MULTI2])
+        if (gc->pad_count[GC_MULTI] || gc->pad_count[GC_MULTI2])
                gc_multi_process_packet(gc);
 /*
 * PSX controllers
 */
-        if (gc->pads[GC_PSX] || gc->pads[GC_DDR])
+        if (gc->pad_count[GC_PSX] || gc->pad_count[GC_DDR])
                gc_psx_process_packet(gc);
        mod_timer(&gc->timer, jiffies + GC_REFRESH_TIME);
@@ -622,25 +814,29 @@ static void gc_close(struct input_dev *dev)
 static int __init gc_setup_pad(struct gc *gc, int idx, int pad_type)
 {
+        struct gc_pad *pad = &gc->pads[idx];
        struct input_dev *input_dev;
        int i;
+        int err;
-        if (!pad_type)
-                return 0;
        if (pad_type < 1 || pad_type > GC_MAX) {
-                printk(KERN_WARNING "gamecon.c: Pad type %d unknown\n", pad_type);
+                pr_err("Pad type %d unknown\n", pad_type);
                return -EINVAL;
        }
-        gc->dev[idx] = input_dev = input_allocate_device();
+        pad->dev = input_dev = input_allocate_device();
        if (!input_dev) {
-                printk(KERN_ERR "gamecon.c: Not enough memory for input device\n");
+                pr_err("Not enough memory for input device\n");
                return -ENOMEM;
        }
+        pad->type = pad_type;
+        snprintf(pad->phys, sizeof(pad->phys),
+                 "%s/input%d", gc->pd->port->name, idx);
        input_dev->name = gc_names[pad_type];
-        input_dev->phys = gc->phys[idx];
+        input_dev->phys = pad->phys;
        input_dev->id.bustype = BUS_PARPORT;
        input_dev->id.vendor = 0x0001;
        input_dev->id.product = pad_type;
@@ -659,61 +855,76 @@ static int __init gc_setup_pad(struct gc *gc, int idx, int pad_type)
        } else
                input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL);
-        gc->pads[0] |= gc_status_bit[idx];
+        gc->pad_count[pad_type]++;
-        gc->pads[pad_type] |= gc_status_bit[idx];
        switch (pad_type) {
-                case GC_N64:
+        case GC_N64:
-                        for (i = 0; i < 10; i++)
+                for (i = 0; i < 10; i++)
-                                set_bit(gc_n64_btn[i], input_dev->keybit);
+                        __set_bit(gc_n64_btn[i], input_dev->keybit);
-                        for (i = 0; i < 2; i++) {
-                                input_set_abs_params(input_dev, ABS_X + i, -127, 126, 0, 2);
-                                input_set_abs_params(input_dev, ABS_HAT0X + i, -1, 1, 0, 0);
-                        }
-                        break;
-                case GC_SNESMOUSE:
-                        set_bit(BTN_LEFT, input_dev->keybit);
-                        set_bit(BTN_RIGHT, input_dev->keybit);
-                        set_bit(REL_X, input_dev->relbit);
-                        set_bit(REL_Y, input_dev->relbit);
-                        break;
-                case GC_SNES:
-                        for (i = 4; i < 8; i++)
-                                set_bit(gc_snes_btn[i], input_dev->keybit);
-                case GC_NES:
-                        for (i = 0; i < 4; i++)
-                                set_bit(gc_snes_btn[i], input_dev->keybit);
-                        break;
-                case GC_MULTI2:
-                        set_bit(BTN_THUMB, input_dev->keybit);
-                case GC_MULTI:
-                        set_bit(BTN_TRIGGER, input_dev->keybit);
-                        break;
-                case GC_PSX:
-                        for (i = 0; i < 6; i++)
-                                input_set_abs_params(input_dev, gc_psx_abs[i], 4, 252, 0, 2);
-                        for (i = 0; i < 12; i++)
-                                set_bit(gc_psx_btn[i], input_dev->keybit);
-                        break;
+                for (i = 0; i < 2; i++) {
+                        input_set_abs_params(input_dev, ABS_X + i, -127, 126, 0, 2);
+                        input_set_abs_params(input_dev, ABS_HAT0X + i, -1, 1, 0, 0);
+                }
-                case GC_DDR:
+                err = gc_n64_init_ff(input_dev, idx);
-                        for (i = 0; i < 4; i++)
+                if (err) {
-                                set_bit(gc_psx_ddr_btn[i], input_dev->keybit);
+                        pr_warning("Failed to initiate rumble for N64 device %d\n", idx);
-                        for (i = 0; i < 12; i++)
+                        goto err_free_dev;
-                                set_bit(gc_psx_btn[i], input_dev->keybit);
+                }
-                        break;
+                break;
+        case GC_SNESMOUSE:
+                __set_bit(BTN_LEFT, input_dev->keybit);
+                __set_bit(BTN_RIGHT, input_dev->keybit);
+                __set_bit(REL_X, input_dev->relbit);
+                __set_bit(REL_Y, input_dev->relbit);
+                break;
+        case GC_SNES:
+                for (i = 4; i < 8; i++)
+                        __set_bit(gc_snes_btn[i], input_dev->keybit);
+        case GC_NES:
+                for (i = 0; i < 4; i++)
+                        __set_bit(gc_snes_btn[i], input_dev->keybit);
+                break;
+        case GC_MULTI2:
+                __set_bit(BTN_THUMB, input_dev->keybit);
+        case GC_MULTI:
+                __set_bit(BTN_TRIGGER, input_dev->keybit);
+                break;
+        case GC_PSX:
+                for (i = 0; i < 6; i++)
+                        input_set_abs_params(input_dev,
+                                             gc_psx_abs[i], 4, 252, 0, 2);
+                for (i = 0; i < 12; i++)
+                        __set_bit(gc_psx_btn[i], input_dev->keybit);
+                break;
+        case GC_DDR:
+                for (i = 0; i < 4; i++)
+                        __set_bit(gc_psx_ddr_btn[i], input_dev->keybit);
+                for (i = 0; i < 12; i++)
+                        __set_bit(gc_psx_btn[i], input_dev->keybit);
+                break;
        }
+        err = input_register_device(pad->dev);
+        if (err)
+                goto err_free_dev;
        return 0;
+err_free_dev:
+        input_free_device(pad->dev);
+        pad->dev = NULL;
+        return err;
 }
 static struct gc __init *gc_probe(int parport, int *pads, int n_pads)
@@ -722,52 +933,47 @@ static struct gc __init *gc_probe(int parport, int *pads, int n_pads)
        struct parport *pp;
        struct pardevice *pd;
        int i;
+        int count = 0;
        int err;
        pp = parport_find_number(parport);
        if (!pp) {
-                printk(KERN_ERR "gamecon.c: no such parport\n");
+                pr_err("no such parport %d\n", parport);
                err = -EINVAL;
                goto err_out;
        }
        pd = parport_register_device(pp, "gamecon", NULL, NULL, NULL, PARPORT_DEV_EXCL, NULL);
        if (!pd) {
-                printk(KERN_ERR "gamecon.c: parport busy already - lp.o loaded?\n");
+                pr_err("parport busy already - lp.o loaded?\n");
                err = -EBUSY;
                goto err_put_pp;
        }
        gc = kzalloc(sizeof(struct gc), GFP_KERNEL);
        if (!gc) {
-                printk(KERN_ERR "gamecon.c: Not enough memory\n");
+                pr_err("Not enough memory\n");
                err = -ENOMEM;
                goto err_unreg_pardev;
        }
        mutex_init(&gc->mutex);
        gc->pd = pd;
-        init_timer(&gc->timer);
+        setup_timer(&gc->timer, gc_timer, (long) gc);
-        gc->timer.data = (long) gc;
-        gc->timer.function = gc_timer;
        for (i = 0; i < n_pads && i < GC_MAX_DEVICES; i++) {
                if (!pads[i])
                        continue;
-                snprintf(gc->phys[i], sizeof(gc->phys[i]),
-                         "%s/input%d", gc->pd->port->name, i);
                err = gc_setup_pad(gc, i, pads[i]);
                if (err)
                        goto err_unreg_devs;
-                err = input_register_device(gc->dev[i]);
+                count++;
-                if (err)
-                        goto err_free_dev;
        }
-        if (!gc->pads[0]) {
+        if (count == 0) {
-                printk(KERN_ERR "gamecon.c: No valid devices specified\n");
+                pr_err("No valid devices specified\n");
                err = -EINVAL;
                goto err_free_gc;
        }
@@ -775,12 +981,10 @@ static struct gc __init *gc_probe(int parport, int *pads, int n_pads)
        parport_put_port(pp);
        return gc;
- err_free_dev:
-        input_free_device(gc->dev[i]);
 err_unreg_devs:
        while (--i >= 0)
-                if (gc->dev[i])
+                if (gc->pads[i].dev)
-                        input_unregister_device(gc->dev[i]);
+                        input_unregister_device(gc->pads[i].dev);
 err_free_gc:
        kfree(gc);
 err_unreg_pardev:
@@ -796,8 +1000,8 @@ static void gc_remove(struct gc *gc)
        int i;
        for (i = 0; i < GC_MAX_DEVICES; i++)
-                if (gc->dev[i])
+                if (gc->pads[i].dev)
-                        input_unregister_device(gc->dev[i]);
+                        input_unregister_device(gc->pads[i].dev);
        parport_unregister_device(gc->pd);
        kfree(gc);
 }
@@ -813,7 +1017,7 @@ static int __init gc_init(void)
                        continue;
                if (gc_cfg[i].nargs < 2) {
-                        printk(KERN_ERR "gamecon.c: at least one device must be specified\n");
+                        pr_err("at least one device must be specified\n");
                        err = -EINVAL;
                        break;
                }
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index 8a28fb7846d..9b3353b404d 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -86,9 +86,8 @@
 /* xbox d-pads should map to buttons, as is required for DDR pads
   but we map them to axes when possible to simplify things */
-#define MAP_DPAD_TO_BUTTONS    0
+#define MAP_DPAD_TO_BUTTONS             (1 << 0)
-#define MAP_DPAD_TO_AXES       1
+#define MAP_TRIGGERS_TO_BUTTONS         (1 << 1)
-#define MAP_DPAD_UNKNOWN       2
 #define XTYPE_XBOX        0
 #define XTYPE_XBOX360     1
@@ -99,57 +98,61 @@ static int dpad_to_buttons;
 module_param(dpad_to_buttons, bool, S_IRUGO);
 MODULE_PARM_DESC(dpad_to_buttons, "Map D-PAD to buttons rather than axes for unknown pads");
+static int triggers_to_buttons;
+module_param(triggers_to_buttons, bool, S_IRUGO);
+MODULE_PARM_DESC(triggers_to_buttons, "Map triggers to buttons rather than axes for unknown pads");
 static const struct xpad_device {
        u16 idVendor;
        u16 idProduct;
        char *name;
-        u8 dpad_mapping;
+        u8 mapping;
        u8 xtype;
 } xpad_device[] = {
-        { 0x045e, 0x0202, "Microsoft X-Box pad v1 (US)", MAP_DPAD_TO_AXES, XTYPE_XBOX },
+        { 0x045e, 0x0202, "Microsoft X-Box pad v1 (US)", 0, XTYPE_XBOX },
-        { 0x045e, 0x0289, "Microsoft X-Box pad v2 (US)", MAP_DPAD_TO_AXES, XTYPE_XBOX },
+        { 0x045e, 0x0289, "Microsoft X-Box pad v2 (US)", 0, XTYPE_XBOX },
-        { 0x045e, 0x0285, "Microsoft X-Box pad (Japan)", MAP_DPAD_TO_AXES, XTYPE_XBOX },
+        { 0x045e, 0x0285, "Microsoft X-Box pad (Japan)", 0, XTYPE_XBOX },
-        { 0x045e, 0x0287, "Microsoft Xbox Controller S", MAP_DPAD_TO_AXES, XTYPE_XBOX },
+        { 0x045e, 0x0287, "Microsoft Xbox Controller S", 0, XTYPE_XBOX },
        { 0x045e, 0x0719, "Xbox 360 Wireless Receiver", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360W },
        { 0x0c12, 0x8809, "RedOctane Xbox Dance Pad", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX },
-        { 0x044f, 0x0f07, "Thrustmaster, Inc. Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX },
+        { 0x044f, 0x0f07, "Thrustmaster, Inc. Controller", 0, XTYPE_XBOX },
-        { 0x046d, 0xc242, "Logitech Chillstream Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX360 },
+        { 0x046d, 0xc242, "Logitech Chillstream Controller", 0, XTYPE_XBOX360 },
-        { 0x046d, 0xca84, "Logitech Xbox Cordless Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX },
+        { 0x046d, 0xca84, "Logitech Xbox Cordless Controller", 0, XTYPE_XBOX },
-        { 0x046d, 0xca88, "Logitech Compact Controller for Xbox", MAP_DPAD_TO_AXES, XTYPE_XBOX },
+        { 0x046d, 0xca88, "Logitech Compact Controller for Xbox", 0, XTYPE_XBOX },
-        { 0x05fd, 0x1007, "Mad Catz Controller (unverified)", MAP_DPAD_TO_AXES, XTYPE_XBOX },
+        { 0x05fd, 0x1007, "Mad Catz Controller (unverified)", 0, XTYPE_XBOX },
-        { 0x05fd, 0x107a, "InterAct 'PowerPad Pro' X-Box pad (Germany)", MAP_DPAD_TO_AXES, XTYPE_XBOX },
+        { 0x05fd, 0x107a, "InterAct 'PowerPad Pro' X-Box pad (Germany)", 0, XTYPE_XBOX },
-        { 0x0738, 0x4516, "Mad Catz Control Pad", MAP_DPAD_TO_AXES, XTYPE_XBOX },
+        { 0x0738, 0x4516, "Mad Catz Control Pad", 0, XTYPE_XBOX },
-        { 0x0738, 0x4522, "Mad Catz LumiCON", MAP_DPAD_TO_AXES, XTYPE_XBOX },
+        { 0x0738, 0x4522, "Mad Catz LumiCON", 0, XTYPE_XBOX },
-        { 0x0738, 0x4526, "Mad Catz Control Pad Pro", MAP_DPAD_TO_AXES, XTYPE_XBOX },
+        { 0x0738, 0x4526, "Mad Catz Control Pad Pro", 0, XTYPE_XBOX },
-        { 0x0738, 0x4536, "Mad Catz MicroCON", MAP_DPAD_TO_AXES, XTYPE_XBOX },
+        { 0x0738, 0x4536, "Mad Catz MicroCON", 0, XTYPE_XBOX },
        { 0x0738, 0x4540, "Mad Catz Beat Pad", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX },
-        { 0x0738, 0x4556, "Mad Catz Lynx Wireless Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX },
+        { 0x0738, 0x4556, "Mad Catz Lynx Wireless Controller", 0, XTYPE_XBOX },
-        { 0x0738, 0x4716, "Mad Catz Wired Xbox 360 Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX360 },
+        { 0x0738, 0x4716, "Mad Catz Wired Xbox 360 Controller", 0, XTYPE_XBOX360 },
-        { 0x0738, 0x4738, "Mad Catz Wired Xbox 360 Controller (SFIV)", MAP_DPAD_TO_AXES, XTYPE_XBOX360 },
+        { 0x0738, 0x4738, "Mad Catz Wired Xbox 360 Controller (SFIV)", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 },
        { 0x0738, 0x6040, "Mad Catz Beat Pad Pro", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX },
-        { 0x0c12, 0x8802, "Zeroplus Xbox Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX },
+        { 0x0c12, 0x8802, "Zeroplus Xbox Controller", 0, XTYPE_XBOX },
-        { 0x0c12, 0x880a, "Pelican Eclipse PL-2023", MAP_DPAD_TO_AXES, XTYPE_XBOX },
+        { 0x0c12, 0x880a, "Pelican Eclipse PL-2023", 0, XTYPE_XBOX },
-        { 0x0c12, 0x8810, "Zeroplus Xbox Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX },
+        { 0x0c12, 0x8810, "Zeroplus Xbox Controller", 0, XTYPE_XBOX },
-        { 0x0c12, 0x9902, "HAMA VibraX - *FAULTY HARDWARE*", MAP_DPAD_TO_AXES, XTYPE_XBOX },
+        { 0x0c12, 0x9902, "HAMA VibraX - *FAULTY HARDWARE*", 0, XTYPE_XBOX },
-        { 0x0e4c, 0x1097, "Radica Gamester Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX },
+        { 0x0e4c, 0x1097, "Radica Gamester Controller", 0, XTYPE_XBOX },
-        { 0x0e4c, 0x2390, "Radica Games Jtech Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX },
+        { 0x0e4c, 0x2390, "Radica Games Jtech Controller", 0, XTYPE_XBOX },
-        { 0x0e6f, 0x0003, "Logic3 Freebird wireless Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX },
+        { 0x0e6f, 0x0003, "Logic3 Freebird wireless Controller", 0, XTYPE_XBOX },
-        { 0x0e6f, 0x0005, "Eclipse wireless Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX },
+        { 0x0e6f, 0x0005, "Eclipse wireless Controller", 0, XTYPE_XBOX },
-        { 0x0e6f, 0x0006, "Edge wireless Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX },
+        { 0x0e6f, 0x0006, "Edge wireless Controller", 0, XTYPE_XBOX },
-        { 0x0e6f, 0x0006, "Pelican 'TSZ' Wired Xbox 360 Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX360 },
+        { 0x0e6f, 0x0006, "Pelican 'TSZ' Wired Xbox 360 Controller", 0, XTYPE_XBOX360 },
-        { 0x0e8f, 0x0201, "SmartJoy Frag Xpad/PS2 adaptor", MAP_DPAD_TO_AXES, XTYPE_XBOX },
+        { 0x0e8f, 0x0201, "SmartJoy Frag Xpad/PS2 adaptor", 0, XTYPE_XBOX },
-        { 0x0f30, 0x0202, "Joytech Advanced Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX },
+        { 0x0f30, 0x0202, "Joytech Advanced Controller", 0, XTYPE_XBOX },
-        { 0x0f30, 0x8888, "BigBen XBMiniPad Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX },
+        { 0x0f30, 0x8888, "BigBen XBMiniPad Controller", 0, XTYPE_XBOX },
-        { 0x102c, 0xff0c, "Joytech Wireless Advanced Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX },
+        { 0x102c, 0xff0c, "Joytech Wireless Advanced Controller", 0, XTYPE_XBOX },
        { 0x12ab, 0x8809, "Xbox DDR dancepad", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX },
-        { 0x1430, 0x4748, "RedOctane Guitar Hero X-plorer", MAP_DPAD_TO_AXES, XTYPE_XBOX360 },
+        { 0x1430, 0x4748, "RedOctane Guitar Hero X-plorer", 0, XTYPE_XBOX360 },
        { 0x1430, 0x8888, "TX6500+ Dance Pad (first generation)", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX },
-        { 0x146b, 0x0601, "BigBen Interactive XBOX 360 Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX360 },
+        { 0x146b, 0x0601, "BigBen Interactive XBOX 360 Controller", 0, XTYPE_XBOX360 },
-        { 0x045e, 0x028e, "Microsoft X-Box 360 pad", MAP_DPAD_TO_AXES, XTYPE_XBOX360 },
+        { 0x045e, 0x028e, "Microsoft X-Box 360 pad", 0, XTYPE_XBOX360 },
        { 0x1bad, 0x0003, "Harmonix Rock Band Drumkit", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 },
-        { 0x0f0d, 0x0016, "Hori Real Arcade Pro.EX", MAP_DPAD_TO_AXES, XTYPE_XBOX360 },
+        { 0x0f0d, 0x0016, "Hori Real Arcade Pro.EX", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 },
-        { 0xffff, 0xffff, "Chinese-made Xbox Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX },
+        { 0xffff, 0xffff, "Chinese-made Xbox Controller", 0, XTYPE_XBOX },
-        { 0x0000, 0x0000, "Generic X-Box pad", MAP_DPAD_UNKNOWN, XTYPE_UNKNOWN }
+        { 0x0000, 0x0000, "Generic X-Box pad", 0, XTYPE_UNKNOWN }
 };
 /* buttons shared with xbox and xbox360 */
@@ -165,13 +168,20 @@ static const signed short xpad_btn[] = {
        -1                      /* terminating entry */
 };
-/* only used if MAP_DPAD_TO_BUTTONS */
+/* used when dpad is mapped to nuttons */
 static const signed short xpad_btn_pad[] = {
        BTN_LEFT, BTN_RIGHT,            /* d-pad left, right */
        BTN_0, BTN_1,                   /* d-pad up, down (XXX names??) */
        -1                              /* terminating entry */
 };
+/* used when triggers are mapped to buttons */
+static const signed short xpad_btn_triggers[] = {
+        BTN_TL2, BTN_TR2,               /* triggers left/right */
+        -1
+};
 static const signed short xpad360_btn[] = {  /* buttons for x360 controller */
        BTN_TL, BTN_TR,         /* Button LB/RB */
        BTN_MODE,               /* The big X button */
@@ -181,16 +191,21 @@ static const signed short xpad360_btn[] = {  /* buttons for x360 controller */
 static const signed short xpad_abs[] = {
        ABS_X, ABS_Y,           /* left stick */
        ABS_RX, ABS_RY,         /* right stick */
-        ABS_Z, ABS_RZ,          /* triggers left/right */
        -1                      /* terminating entry */
 };
-/* only used if MAP_DPAD_TO_AXES */
+/* used when dpad is mapped to axes */
 static const signed short xpad_abs_pad[] = {
        ABS_HAT0X, ABS_HAT0Y,   /* d-pad axes */
        -1                      /* terminating entry */
 };
+/* used when triggers are mapped to axes */
+static const signed short xpad_abs_triggers[] = {
+        ABS_Z, ABS_RZ,          /* triggers left/right */
+        -1
+};
 /* Xbox 360 has a vendor-specific class, so we cannot match it with only
 * USB_INTERFACE_INFO (also specifically refused by USB subsystem), so we
 * match against vendor id as well. Wired Xbox 360 devices have protocol 1,
@@ -246,7 +261,7 @@ struct usb_xpad {
        char phys[64];                  /* physical device path */
-        int dpad_mapping;               /* map d-pad to buttons or to axes */
+        int mapping;                    /* map d-pad to buttons or to axes */
        int xtype;                      /* type of xbox device */
 };
@@ -277,20 +292,25 @@ static void xpad_process_packet(struct usb_xpad *xpad, u16 cmd, unsigned char *d
                         ~(__s16) le16_to_cpup((__le16 *)(data + 18)));
        /* triggers left/right */
-        input_report_abs(dev, ABS_Z, data[10]);
+        if (xpad->mapping & MAP_TRIGGERS_TO_BUTTONS) {
-        input_report_abs(dev, ABS_RZ, data[11]);
+                input_report_key(dev, BTN_TL2, data[10]);
+                input_report_key(dev, BTN_TR2, data[11]);
+        } else {
+                input_report_abs(dev, ABS_Z, data[10]);
+                input_report_abs(dev, ABS_RZ, data[11]);
+        }
        /* digital pad */
-        if (xpad->dpad_mapping == MAP_DPAD_TO_AXES) {
+        if (xpad->mapping & MAP_DPAD_TO_BUTTONS) {
-                input_report_abs(dev, ABS_HAT0X,
-                                 !!(data[2] & 0x08) - !!(data[2] & 0x04));
-                input_report_abs(dev, ABS_HAT0Y,
-                                 !!(data[2] & 0x02) - !!(data[2] & 0x01));
-        } else /* xpad->dpad_mapping == MAP_DPAD_TO_BUTTONS */ {
                input_report_key(dev, BTN_LEFT,  data[2] & 0x04);
                input_report_key(dev, BTN_RIGHT, data[2] & 0x08);
                input_report_key(dev, BTN_0,     data[2] & 0x01); /* up */
                input_report_key(dev, BTN_1,     data[2] & 0x02); /* down */
+        } else {
+                input_report_abs(dev, ABS_HAT0X,
+                                 !!(data[2] & 0x08) - !!(data[2] & 0x04));
+                input_report_abs(dev, ABS_HAT0Y,
+                                 !!(data[2] & 0x02) - !!(data[2] & 0x01));
        }
        /* start/back buttons and stick press left/right */
@@ -328,17 +348,17 @@ static void xpad360_process_packet(struct usb_xpad *xpad,
        struct input_dev *dev = xpad->dev;
        /* digital pad */
-        if (xpad->dpad_mapping == MAP_DPAD_TO_AXES) {
+        if (xpad->mapping & MAP_DPAD_TO_BUTTONS) {
-                input_report_abs(dev, ABS_HAT0X,
-                                 !!(data[2] & 0x08) - !!(data[2] & 0x04));
-                input_report_abs(dev, ABS_HAT0Y,
-                                 !!(data[2] & 0x02) - !!(data[2] & 0x01));
-        } else if (xpad->dpad_mapping == MAP_DPAD_TO_BUTTONS) {
                /* dpad as buttons (right, left, down, up) */
                input_report_key(dev, BTN_LEFT, data[2] & 0x04);
                input_report_key(dev, BTN_RIGHT, data[2] & 0x08);
                input_report_key(dev, BTN_0, data[2] & 0x01);   /* up */
                input_report_key(dev, BTN_1, data[2] & 0x02);   /* down */
+        } else {
+                input_report_abs(dev, ABS_HAT0X,
+                                 !!(data[2] & 0x08) - !!(data[2] & 0x04));
+                input_report_abs(dev, ABS_HAT0Y,
+                                 !!(data[2] & 0x02) - !!(data[2] & 0x01));
        }
        /* start/back buttons */
@@ -371,8 +391,13 @@ static void xpad360_process_packet(struct usb_xpad *xpad,
                         ~(__s16) le16_to_cpup((__le16 *)(data + 12)));
        /* triggers left/right */
-        input_report_abs(dev, ABS_Z, data[4]);
+        if (xpad->mapping & MAP_TRIGGERS_TO_BUTTONS) {
-        input_report_abs(dev, ABS_RZ, data[5]);
+                input_report_key(dev, BTN_TL2, data[4]);
+                input_report_key(dev, BTN_TR2, data[5]);
+        } else {
+                input_report_abs(dev, ABS_Z, data[4]);
+                input_report_abs(dev, ABS_RZ, data[5]);
+        }
        input_sync(dev);
 }
@@ -505,7 +530,7 @@ static int xpad_init_output(struct usb_interface *intf, struct usb_xpad *xpad)
        struct usb_endpoint_descriptor *ep_irq_out;
        int error = -ENOMEM;
-        if (xpad->xtype != XTYPE_XBOX360)
+        if (xpad->xtype != XTYPE_XBOX360 && xpad->xtype != XTYPE_XBOX)
                return 0;
        xpad->odata = usb_buffer_alloc(xpad->udev, XPAD_PKT_LEN,
@@ -535,13 +560,13 @@ static int xpad_init_output(struct usb_interface *intf, struct usb_xpad *xpad)
 static void xpad_stop_output(struct usb_xpad *xpad)
 {
-        if (xpad->xtype == XTYPE_XBOX360)
+        if (xpad->xtype == XTYPE_XBOX360 || xpad->xtype == XTYPE_XBOX)
                usb_kill_urb(xpad->irq_out);
 }
 static void xpad_deinit_output(struct usb_xpad *xpad)
 {
-        if (xpad->xtype == XTYPE_XBOX360) {
+        if (xpad->xtype == XTYPE_XBOX360 || xpad->xtype == XTYPE_XBOX) {
                usb_free_urb(xpad->irq_out);
                usb_buffer_free(xpad->udev, XPAD_PKT_LEN,
                                xpad->odata, xpad->odata_dma);
@@ -554,24 +579,45 @@ static void xpad_stop_output(struct usb_xpad *xpad) {}
 #endif
 #ifdef CONFIG_JOYSTICK_XPAD_FF
-static int xpad_play_effect(struct input_dev *dev, void *data,
+static int xpad_play_effect(struct input_dev *dev, void *data, struct ff_effect *effect)
-                            struct ff_effect *effect)
 {
        struct usb_xpad *xpad = input_get_drvdata(dev);
        if (effect->type == FF_RUMBLE) {
                __u16 strong = effect->u.rumble.strong_magnitude;
                __u16 weak = effect->u.rumble.weak_magnitude;
-                xpad->odata[0] = 0x00;
-                xpad->odata[1] = 0x08;
+                switch (xpad->xtype) {
-                xpad->odata[2] = 0x00;
-                xpad->odata[3] = strong / 256;
+                case XTYPE_XBOX:
-                xpad->odata[4] = weak / 256;
+                        xpad->odata[0] = 0x00;
-                xpad->odata[5] = 0x00;
+                        xpad->odata[1] = 0x06;
-                xpad->odata[6] = 0x00;
+                        xpad->odata[2] = 0x00;
-                xpad->odata[7] = 0x00;
+                        xpad->odata[3] = strong / 256;  /* left actuator */
-                xpad->irq_out->transfer_buffer_length = 8;
+                        xpad->odata[4] = 0x00;
-                usb_submit_urb(xpad->irq_out, GFP_ATOMIC);
+                        xpad->odata[5] = weak / 256;    /* right actuator */
+                        xpad->irq_out->transfer_buffer_length = 6;
+                        return usb_submit_urb(xpad->irq_out, GFP_ATOMIC);
+                case XTYPE_XBOX360:
+                        xpad->odata[0] = 0x00;
+                        xpad->odata[1] = 0x08;
+                        xpad->odata[2] = 0x00;
+                        xpad->odata[3] = strong / 256;  /* left actuator? */
+                        xpad->odata[4] = weak / 256;    /* right actuator? */
+                        xpad->odata[5] = 0x00;
+                        xpad->odata[6] = 0x00;
+                        xpad->odata[7] = 0x00;
+                        xpad->irq_out->transfer_buffer_length = 8;
+                        return usb_submit_urb(xpad->irq_out, GFP_ATOMIC);
+                default:
+                        dbg("%s - rumble command sent to unsupported xpad type: %d",
+                                __func__, xpad->xtype);
+                        return -1;
+                }
        }
        return 0;
@@ -579,7 +625,7 @@ static int xpad_play_effect(struct input_dev *dev, void *data,
 static int xpad_init_ff(struct usb_xpad *xpad)
 {
-        if (xpad->xtype != XTYPE_XBOX360)
+        if (xpad->xtype != XTYPE_XBOX360 && xpad->xtype != XTYPE_XBOX)
                return 0;
        input_set_capability(xpad->dev, EV_FF, FF_RUMBLE);
@@ -712,11 +758,11 @@ static void xpad_set_up_abs(struct input_dev *input_dev, signed short abs)
                input_set_abs_params(input_dev, abs, -32768, 32767, 16, 128);
                break;
        case ABS_Z:
-        case ABS_RZ:    /* the triggers */
+        case ABS_RZ:    /* the triggers (if mapped to axes) */
                input_set_abs_params(input_dev, abs, 0, 255, 0, 0);
                break;
        case ABS_HAT0X:
-        case ABS_HAT0Y: /* the d-pad (only if MAP_DPAD_TO_AXES) */
+        case ABS_HAT0Y: /* the d-pad (only if dpad is mapped to axes */
                input_set_abs_params(input_dev, abs, -1, 1, 0, 0);
                break;
        }
@@ -752,10 +798,9 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id
                goto fail2;
        xpad->udev = udev;
-        xpad->dpad_mapping = xpad_device[i].dpad_mapping;
+        xpad->mapping = xpad_device[i].mapping;
        xpad->xtype = xpad_device[i].xtype;
-        if (xpad->dpad_mapping == MAP_DPAD_UNKNOWN)
-                xpad->dpad_mapping = !dpad_to_buttons;
        if (xpad->xtype == XTYPE_UNKNOWN) {
                if (intf->cur_altsetting->desc.bInterfaceClass == USB_CLASS_VENDOR_SPEC) {
                        if (intf->cur_altsetting->desc.bInterfaceProtocol == 129)
@@ -764,7 +809,13 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id
                                xpad->xtype = XTYPE_XBOX360;
                } else
                        xpad->xtype = XTYPE_XBOX;
+                if (dpad_to_buttons)
+                        xpad->mapping |= MAP_DPAD_TO_BUTTONS;
+                if (triggers_to_buttons)
+                        xpad->mapping |= MAP_TRIGGERS_TO_BUTTONS;
        }
        xpad->dev = input_dev;
        usb_make_path(udev, xpad->phys, sizeof(xpad->phys));
        strlcat(xpad->phys, "/input0", sizeof(xpad->phys));
@@ -781,25 +832,37 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id
        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
-        /* set up buttons */
+        /* set up standard buttons and axes */
        for (i = 0; xpad_common_btn[i] >= 0; i++)
-                set_bit(xpad_common_btn[i], input_dev->keybit);
+                __set_bit(xpad_common_btn[i], input_dev->keybit);
-        if ((xpad->xtype == XTYPE_XBOX360) || (xpad->xtype == XTYPE_XBOX360W))
-                for (i = 0; xpad360_btn[i] >= 0; i++)
-                        set_bit(xpad360_btn[i], input_dev->keybit);
-        else
-                for (i = 0; xpad_btn[i] >= 0; i++)
-                        set_bit(xpad_btn[i], input_dev->keybit);
-        if (xpad->dpad_mapping == MAP_DPAD_TO_BUTTONS)
-                for (i = 0; xpad_btn_pad[i] >= 0; i++)
-                        set_bit(xpad_btn_pad[i], input_dev->keybit);
-        /* set up axes */
        for (i = 0; xpad_abs[i] >= 0; i++)
                xpad_set_up_abs(input_dev, xpad_abs[i]);
-        if (xpad->dpad_mapping == MAP_DPAD_TO_AXES)
+        /* Now set up model-specific ones */
+        if (xpad->xtype == XTYPE_XBOX360 || xpad->xtype == XTYPE_XBOX360W) {
+                for (i = 0; xpad360_btn[i] >= 0; i++)
+                        __set_bit(xpad360_btn[i], input_dev->keybit);
+        } else {
+                for (i = 0; xpad_btn[i] >= 0; i++)
+                        __set_bit(xpad_btn[i], input_dev->keybit);
+        }
+        if (xpad->mapping & MAP_DPAD_TO_BUTTONS) {
+                for (i = 0; xpad_btn_pad[i] >= 0; i++)
+                        __set_bit(xpad_btn_pad[i], input_dev->keybit);
+        } else {
                for (i = 0; xpad_abs_pad[i] >= 0; i++)
                    xpad_set_up_abs(input_dev, xpad_abs_pad[i]);
+        }
+        if (xpad->mapping & MAP_TRIGGERS_TO_BUTTONS) {
+                for (i = 0; xpad_btn_triggers[i] >= 0; i++)
+                        __set_bit(xpad_btn_triggers[i], input_dev->keybit);
+        } else {
+                for (i = 0; xpad_abs_triggers[i] >= 0; i++)
+                        xpad_set_up_abs(input_dev, xpad_abs_triggers[i]);
+        }
        error = xpad_init_output(intf, xpad);
        if (error)
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index 02c836e1181..64c102355f5 100644
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -35,10 +35,10 @@ config KEYBOARD_ADP5520
          be called adp5520-keys.
 config KEYBOARD_ADP5588
-        tristate "ADP5588 I2C QWERTY Keypad and IO Expander"
+        tristate "ADP5588/87 I2C QWERTY Keypad and IO Expander"
        depends on I2C
        help
-          Say Y here if you want to use a ADP5588 attached to your
+          Say Y here if you want to use a ADP5588/87 attached to your
          system I2C bus.
          To compile this driver as a module, choose M here: the
@@ -144,13 +144,15 @@ config KEYBOARD_BFIN
          module will be called bf54x-keys.
 config KEYBOARD_CORGI
-        tristate "Corgi keyboard"
+        tristate "Corgi keyboard (deprecated)"
        depends on PXA_SHARPSL
-        default y
        help
          Say Y here to enable the keyboard on the Sharp Zaurus SL-C7xx
          series of PDAs.
+          This driver is now deprecated, use generic GPIO based matrix
+          keyboard driver instead.
          To compile this driver as a module, choose M here: the
          module will be called corgikbd.
@@ -292,6 +294,15 @@ config KEYBOARD_MAX7359
          To compile this driver as a module, choose M here: the
          module will be called max7359_keypad.
+config KEYBOARD_IMX
+        tristate "IMX keypad support"
+        depends on ARCH_MXC
+        help
+          Enable support for IMX keypad port.
+          To compile this driver as a module, choose M here: the
+          module will be called imx_keypad.
 config KEYBOARD_NEWTON
        tristate "Newton keyboard"
        select SERIO
@@ -329,13 +340,15 @@ config KEYBOARD_PXA930_ROTARY
          module will be called pxa930_rotary.
 config KEYBOARD_SPITZ
-        tristate "Spitz keyboard"
+        tristate "Spitz keyboard (deprecated)"
        depends on PXA_SHARPSL
-        default y
        help
          Say Y here to enable the keyboard on the Sharp Zaurus SL-C1000,
          SL-C3000 and Sl-C3100 series of PDAs.
+          This driver is now deprecated, use generic GPIO based matrix
+          keyboard driver instead.
          To compile this driver as a module, choose M here: the
          module will be called spitzkbd.
@@ -363,7 +376,7 @@ config KEYBOARD_SUNKBD
 config KEYBOARD_SH_KEYSC
        tristate "SuperH KEYSC keypad support"
-        depends on SUPERH
+        depends on SUPERH || ARCH_SHMOBILE
        help
          Say Y here if you want to use a keypad attached to the KEYSC block
          on SuperH processors such as sh7722 and sh7343.
@@ -402,12 +415,14 @@ config KEYBOARD_TWL4030
          module will be called twl4030_keypad.
 config KEYBOARD_TOSA
-        tristate "Tosa keyboard"
+        tristate "Tosa keyboard (deprecated)"
        depends on MACH_TOSA
-        default y
        help
          Say Y here to enable the keyboard on the Sharp Zaurus SL-6000x (Tosa)
+          This driver is now deprecated, use generic GPIO based matrix
+          keyboard driver instead.
          To compile this driver as a module, choose M here: the
          module will be called tosakbd.
diff --git a/drivers/input/keyboard/Makefile b/drivers/input/keyboard/Makefile
index 78654ef6520..706c6b5ed5f 100644
--- a/drivers/input/keyboard/Makefile
+++ b/drivers/input/keyboard/Makefile
@@ -17,6 +17,7 @@ obj-$(CONFIG_KEYBOARD_EP93XX)		+= ep93xx_keypad.o
 obj-$(CONFIG_KEYBOARD_GPIO)             += gpio_keys.o
 obj-$(CONFIG_KEYBOARD_HIL)              += hil_kbd.o
 obj-$(CONFIG_KEYBOARD_HIL_OLD)          += hilkbd.o
+obj-$(CONFIG_KEYBOARD_IMX)              += imx_keypad.o
 obj-$(CONFIG_KEYBOARD_HP6XX)            += jornada680_kbd.o
 obj-$(CONFIG_KEYBOARD_HP7XX)            += jornada720_kbd.o
 obj-$(CONFIG_KEYBOARD_LKKBD)            += lkkbd.o
diff --git a/drivers/input/keyboard/adp5588-keys.c b/drivers/input/keyboard/adp5588-keys.c
index 1edb596d927..b5142d2d511 100644
--- a/drivers/input/keyboard/adp5588-keys.c
+++ b/drivers/input/keyboard/adp5588-keys.c
@@ -1,6 +1,7 @@
 /*
 * File: drivers/input/keyboard/adp5588_keys.c
- * Description:  keypad driver for ADP5588 I2C QWERTY Keypad and IO Expander
+ * Description:  keypad driver for ADP5588 and ADP5587
+ *               I2C QWERTY Keypad and IO Expander
 * Bugs: Enter bugs at http://blackfin.uclinux.org/
 *
 * Copyright (C) 2008-2009 Analog Devices Inc.
@@ -327,6 +328,7 @@ static const struct dev_pm_ops adp5588_dev_pm_ops = {
 static const struct i2c_device_id adp5588_id[] = {
        { KBUILD_MODNAME, 0 },
+        { "adp5587-keys", 0 },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, adp5588_id);
@@ -357,5 +359,5 @@ module_exit(adp5588_exit);
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");
-MODULE_DESCRIPTION("ADP5588 Keypad driver");
+MODULE_DESCRIPTION("ADP5588/87 Keypad driver");
 MODULE_ALIAS("platform:adp5588-keys");
diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c
index 7b4056292ea..d358ef8623f 100644
--- a/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
@@ -40,26 +40,26 @@ module_param_named(set, atkbd_set, int, 0);
 MODULE_PARM_DESC(set, "Select keyboard code set (2 = default, 3 = PS/2 native)");
 #if defined(__i386__) || defined(__x86_64__) || defined(__hppa__)
-static int atkbd_reset;
+static bool atkbd_reset;
 #else
-static int atkbd_reset = 1;
+static bool atkbd_reset = true;
 #endif
 module_param_named(reset, atkbd_reset, bool, 0);
 MODULE_PARM_DESC(reset, "Reset keyboard during initialization");
-static int atkbd_softrepeat;
+static bool atkbd_softrepeat;
 module_param_named(softrepeat, atkbd_softrepeat, bool, 0);
 MODULE_PARM_DESC(softrepeat, "Use software keyboard repeat");
-static int atkbd_softraw = 1;
+static bool atkbd_softraw = true;
 module_param_named(softraw, atkbd_softraw, bool, 0);
 MODULE_PARM_DESC(softraw, "Use software generated rawmode");
-static int atkbd_scroll;
+static bool atkbd_scroll;
 module_param_named(scroll, atkbd_scroll, bool, 0);
 MODULE_PARM_DESC(scroll, "Enable scroll-wheel on MS Office and similar keyboards");
-static int atkbd_extra;
+static bool atkbd_extra;
 module_param_named(extra, atkbd_extra, bool, 0);
 MODULE_PARM_DESC(extra, "Enable extra LEDs and keys on IBM RapidAcces, EzKey and similar keyboards");
@@ -153,16 +153,16 @@ static const unsigned short atkbd_unxlate_table[128] = {
 #define ATKBD_RET_HANGEUL       0xf2
 #define ATKBD_RET_ERR           0xff
-#define ATKBD_KEY_UNKNOWN         0
+#define ATKBD_KEY_UNKNOWN       0
 #define ATKBD_KEY_NULL          255
-#define ATKBD_SCR_1             254
+#define ATKBD_SCR_1             0xfffe
-#define ATKBD_SCR_2             253
+#define ATKBD_SCR_2             0xfffd
-#define ATKBD_SCR_4             252
+#define ATKBD_SCR_4             0xfffc
-#define ATKBD_SCR_8             251
+#define ATKBD_SCR_8             0xfffb
-#define ATKBD_SCR_CLICK         250
+#define ATKBD_SCR_CLICK         0xfffa
-#define ATKBD_SCR_LEFT          249
+#define ATKBD_SCR_LEFT          0xfff9
-#define ATKBD_SCR_RIGHT         248
+#define ATKBD_SCR_RIGHT         0xfff8
 #define ATKBD_SPECIAL           ATKBD_SCR_RIGHT
@@ -177,7 +177,7 @@ static const unsigned short atkbd_unxlate_table[128] = {
 #define ATKBD_XL_HANJA          0x20
 static const struct {
-        unsigned char keycode;
+        unsigned short keycode;
        unsigned char set2;
 } atkbd_scroll_keys[] = {
        { ATKBD_SCR_1,     0xc5 },
@@ -206,18 +206,18 @@ struct atkbd {
        unsigned short keycode[ATKBD_KEYMAP_SIZE];
        DECLARE_BITMAP(force_release_mask, ATKBD_KEYMAP_SIZE);
        unsigned char set;
-        unsigned char translated;
+        bool translated;
-        unsigned char extra;
+        bool extra;
-        unsigned char write;
+        bool write;
-        unsigned char softrepeat;
+        bool softrepeat;
-        unsigned char softraw;
+        bool softraw;
-        unsigned char scroll;
+        bool scroll;
-        unsigned char enabled;
+        bool enabled;
        /* Accessed only from interrupt */
        unsigned char emul;
-        unsigned char resend;
+        bool resend;
-        unsigned char release;
+        bool release;
        unsigned long xl_bit;
        unsigned int last;
        unsigned long time;
@@ -301,18 +301,18 @@ static const unsigned int xl_table[] = {
 * Checks if we should mangle the scancode to extract 'release' bit
 * in translated mode.
 */
-static int atkbd_need_xlate(unsigned long xl_bit, unsigned char code)
+static bool atkbd_need_xlate(unsigned long xl_bit, unsigned char code)
 {
        int i;
        if (code == ATKBD_RET_EMUL0 || code == ATKBD_RET_EMUL1)
-                return 0;
+                return false;
        for (i = 0; i < ARRAY_SIZE(xl_table); i++)
                if (code == xl_table[i])
                        return test_bit(i, &xl_bit);
-        return 1;
+        return true;
 }
 /*
@@ -359,7 +359,7 @@ static unsigned int atkbd_compat_scancode(struct atkbd *atkbd, unsigned int code
 */
 static irqreturn_t atkbd_interrupt(struct serio *serio, unsigned char data,
-                        unsigned int flags)
+                                   unsigned int flags)
 {
        struct atkbd *atkbd = serio_get_drvdata(serio);
        struct input_dev *dev = atkbd->dev;
@@ -368,20 +368,18 @@ static irqreturn_t atkbd_interrupt(struct serio *serio, unsigned char data,
        int value;
        unsigned short keycode;
-#ifdef ATKBD_DEBUG
+        dev_dbg(&serio->dev, "Received %02x flags %02x\n", data, flags);
-        printk(KERN_DEBUG "atkbd.c: Received %02x flags %02x\n", data, flags);
-#endif
 #if !defined(__i386__) && !defined (__x86_64__)
        if ((flags & (SERIO_FRAME | SERIO_PARITY)) && (~flags & SERIO_TIMEOUT) && !atkbd->resend && atkbd->write) {
-                printk(KERN_WARNING "atkbd.c: frame/parity error: %02x\n", flags);
+                dev_warn(&serio->dev, "Frame/parity error: %02x\n", flags);
                serio_write(serio, ATKBD_CMD_RESEND);
-                atkbd->resend = 1;
+                atkbd->resend = true;
                goto out;
        }
        if (!flags && data == ATKBD_RET_ACK)
-                atkbd->resend = 0;
+                atkbd->resend = false;
 #endif
        if (unlikely(atkbd->ps2dev.flags & PS2_FLAG_ACK))
@@ -412,32 +410,32 @@ static irqreturn_t atkbd_interrupt(struct serio *serio, unsigned char data,
        }
        switch (code) {
-                case ATKBD_RET_BAT:
+        case ATKBD_RET_BAT:
-                        atkbd->enabled = 0;
+                atkbd->enabled = false;
-                        serio_reconnect(atkbd->ps2dev.serio);
+                serio_reconnect(atkbd->ps2dev.serio);
-                        goto out;
+                goto out;
-                case ATKBD_RET_EMUL0:
+        case ATKBD_RET_EMUL0:
-                        atkbd->emul = 1;
+                atkbd->emul = 1;
-                        goto out;
+                goto out;
-                case ATKBD_RET_EMUL1:
+        case ATKBD_RET_EMUL1:
-                        atkbd->emul = 2;
+                atkbd->emul = 2;
-                        goto out;
+                goto out;
-                case ATKBD_RET_RELEASE:
+        case ATKBD_RET_RELEASE:
-                        atkbd->release = 1;
+                atkbd->release = true;
-                        goto out;
+                goto out;
-                case ATKBD_RET_ACK:
+        case ATKBD_RET_ACK:
-                case ATKBD_RET_NAK:
+        case ATKBD_RET_NAK:
-                        if (printk_ratelimit())
+                if (printk_ratelimit())
-                                printk(KERN_WARNING "atkbd.c: Spurious %s on %s. "
+                        dev_warn(&serio->dev,
-                                       "Some program might be trying access hardware directly.\n",
+                                 "Spurious %s on %s. "
-                                       data == ATKBD_RET_ACK ? "ACK" : "NAK", serio->phys);
+                                 "Some program might be trying access hardware directly.\n",
-                        goto out;
+                                 data == ATKBD_RET_ACK ? "ACK" : "NAK", serio->phys);
-                case ATKBD_RET_ERR:
+                goto out;
-                        atkbd->err_count++;
+        case ATKBD_RET_ERR:
-#ifdef ATKBD_DEBUG
+                atkbd->err_count++;
-                        printk(KERN_DEBUG "atkbd.c: Keyboard on %s reports too many keys pressed.\n", serio->phys);
+                dev_dbg(&serio->dev, "Keyboard on %s reports too many keys pressed.\n",
-#endif
+                        serio->phys);
-                        goto out;
+                goto out;
        }
        code = atkbd_compat_scancode(atkbd, code);
@@ -451,71 +449,72 @@ static irqreturn_t atkbd_interrupt(struct serio *serio, unsigned char data,
                input_event(dev, EV_MSC, MSC_SCAN, code);
        switch (keycode) {
-                case ATKBD_KEY_NULL:
+        case ATKBD_KEY_NULL:
-                        break;
+                break;
-                case ATKBD_KEY_UNKNOWN:
+        case ATKBD_KEY_UNKNOWN:
-                        printk(KERN_WARNING
+                dev_warn(&serio->dev,
-                               "atkbd.c: Unknown key %s (%s set %d, code %#x on %s).\n",
+                         "Unknown key %s (%s set %d, code %#x on %s).\n",
-                               atkbd->release ? "released" : "pressed",
+                         atkbd->release ? "released" : "pressed",
-                               atkbd->translated ? "translated" : "raw",
+                         atkbd->translated ? "translated" : "raw",
-                               atkbd->set, code, serio->phys);
+                         atkbd->set, code, serio->phys);
-                        printk(KERN_WARNING
+                dev_warn(&serio->dev,
-                               "atkbd.c: Use 'setkeycodes %s%02x <keycode>' to make it known.\n",
+                         "Use 'setkeycodes %s%02x <keycode>' to make it known.\n",
-                               code & 0x80 ? "e0" : "", code & 0x7f);
+                         code & 0x80 ? "e0" : "", code & 0x7f);
-                        input_sync(dev);
+                input_sync(dev);
-                        break;
+                break;
-                case ATKBD_SCR_1:
+        case ATKBD_SCR_1:
-                        scroll = 1 - atkbd->release * 2;
+                scroll = 1;
-                        break;
+                break;
-                case ATKBD_SCR_2:
+        case ATKBD_SCR_2:
-                        scroll = 2 - atkbd->release * 4;
+                scroll = 2;
-                        break;
+                break;
-                case ATKBD_SCR_4:
+        case ATKBD_SCR_4:
-                        scroll = 4 - atkbd->release * 8;
+                scroll = 4;
-                        break;
+                break;
-                case ATKBD_SCR_8:
+        case ATKBD_SCR_8:
-                        scroll = 8 - atkbd->release * 16;
+                scroll = 8;
-                        break;
+                break;
-                case ATKBD_SCR_CLICK:
+        case ATKBD_SCR_CLICK:
-                        click = !atkbd->release;
+                click = !atkbd->release;
-                        break;
+                break;
-                case ATKBD_SCR_LEFT:
+        case ATKBD_SCR_LEFT:
-                        hscroll = -1;
+                hscroll = -1;
-                        break;
+                break;
-                case ATKBD_SCR_RIGHT:
+        case ATKBD_SCR_RIGHT:
-                        hscroll = 1;
+                hscroll = 1;
-                        break;
+                break;
-                default:
+        default:
-                        if (atkbd->release) {
+                if (atkbd->release) {
-                                value = 0;
+                        value = 0;
-                                atkbd->last = 0;
+                        atkbd->last = 0;
-                        } else if (!atkbd->softrepeat && test_bit(keycode, dev->key)) {
+                } else if (!atkbd->softrepeat && test_bit(keycode, dev->key)) {
-                                /* Workaround Toshiba laptop multiple keypress */
+                        /* Workaround Toshiba laptop multiple keypress */
-                                value = time_before(jiffies, atkbd->time) && atkbd->last == code ? 1 : 2;
+                        value = time_before(jiffies, atkbd->time) && atkbd->last == code ? 1 : 2;
-                        } else {
+                } else {
-                                value = 1;
+                        value = 1;
-                                atkbd->last = code;
+                        atkbd->last = code;
-                                atkbd->time = jiffies + msecs_to_jiffies(dev->rep[REP_DELAY]) / 2;
+                        atkbd->time = jiffies + msecs_to_jiffies(dev->rep[REP_DELAY]) / 2;
-                        }
+                }
-                        input_event(dev, EV_KEY, keycode, value);
+                input_event(dev, EV_KEY, keycode, value);
-                        input_sync(dev);
+                input_sync(dev);
-                        if (value && test_bit(code, atkbd->force_release_mask)) {
+                if (value && test_bit(code, atkbd->force_release_mask)) {
-                                input_report_key(dev, keycode, 0);
+                        input_report_key(dev, keycode, 0);
-                                input_sync(dev);
+                        input_sync(dev);
-                        }
+                }
        }
        if (atkbd->scroll) {
                if (click != -1)
                        input_report_key(dev, BTN_MIDDLE, click);
-                input_report_rel(dev, REL_WHEEL, scroll);
+                input_report_rel(dev, REL_WHEEL,
+                                 atkbd->release ? -scroll : scroll);
                input_report_rel(dev, REL_HWHEEL, hscroll);
                input_sync(dev);
        }
-        atkbd->release = 0;
+        atkbd->release = false;
 out:
        return IRQ_HANDLED;
 }
@@ -634,17 +633,18 @@ static int atkbd_event(struct input_dev *dev,
        switch (type) {
-                case EV_LED:
+        case EV_LED:
-                        atkbd_schedule_event_work(atkbd, ATKBD_LED_EVENT_BIT);
+                atkbd_schedule_event_work(atkbd, ATKBD_LED_EVENT_BIT);
-                        return 0;
+                return 0;
-                case EV_REP:
+        case EV_REP:
-                        if (!atkbd->softrepeat)
+                if (!atkbd->softrepeat)
-                                atkbd_schedule_event_work(atkbd, ATKBD_REP_EVENT_BIT);
+                        atkbd_schedule_event_work(atkbd, ATKBD_REP_EVENT_BIT);
-                        return 0;
+                return 0;
-        }
-        return -1;
+        default:
+                return -1;
+        }
 }
 /*
@@ -655,7 +655,7 @@ static int atkbd_event(struct input_dev *dev,
 static inline void atkbd_enable(struct atkbd *atkbd)
 {
        serio_pause_rx(atkbd->ps2dev.serio);
-        atkbd->enabled = 1;
+        atkbd->enabled = true;
        serio_continue_rx(atkbd->ps2dev.serio);
 }
@@ -667,7 +667,7 @@ static inline void atkbd_enable(struct atkbd *atkbd)
 static inline void atkbd_disable(struct atkbd *atkbd)
 {
        serio_pause_rx(atkbd->ps2dev.serio);
-        atkbd->enabled = 0;
+        atkbd->enabled = false;
        serio_continue_rx(atkbd->ps2dev.serio);
 }
@@ -688,7 +688,9 @@ static int atkbd_probe(struct atkbd *atkbd)
        if (atkbd_reset)
                if (ps2_command(ps2dev, NULL, ATKBD_CMD_RESET_BAT))
-                        printk(KERN_WARNING "atkbd.c: keyboard reset failed on %s\n", ps2dev->serio->phys);
+                        dev_warn(&ps2dev->serio->dev,
+                                 "keyboard reset failed on %s\n",
+                                 ps2dev->serio->phys);
 /*
 * Then we check the keyboard ID. We should get 0xab83 under normal conditions.
@@ -718,8 +720,9 @@ static int atkbd_probe(struct atkbd *atkbd)
        atkbd->id = (param[0] << 8) | param[1];
        if (atkbd->id == 0xaca1 && atkbd->translated) {
-                printk(KERN_ERR "atkbd.c: NCD terminal keyboards are only supported on non-translating\n");
+                dev_err(&ps2dev->serio->dev,
-                printk(KERN_ERR "atkbd.c: controllers. Use i8042.direct=1 to disable translation.\n");
+                        "NCD terminal keyboards are only supported on non-translating controlelrs. "
+                        "Use i8042.direct=1 to disable translation.\n");
                return -1;
        }
@@ -737,7 +740,7 @@ static int atkbd_select_set(struct atkbd *atkbd, int target_set, int allow_extra
        struct ps2dev *ps2dev = &atkbd->ps2dev;
        unsigned char param[2];
-        atkbd->extra = 0;
+        atkbd->extra = false;
 /*
 * For known special keyboards we can go ahead and set the correct set.
 * We check for NCD PS/2 Sun, NorthGate OmniKey 101 and
@@ -756,7 +759,7 @@ static int atkbd_select_set(struct atkbd *atkbd, int target_set, int allow_extra
        if (allow_extra) {
                param[0] = 0x71;
                if (!ps2_command(ps2dev, param, ATKBD_CMD_EX_ENABLE)) {
-                        atkbd->extra = 1;
+                        atkbd->extra = true;
                        return 2;
                }
        }
@@ -821,7 +824,8 @@ static int atkbd_activate(struct atkbd *atkbd)
 */
        if (ps2_command(ps2dev, NULL, ATKBD_CMD_ENABLE)) {
-                printk(KERN_ERR "atkbd.c: Failed to enable keyboard on %s\n",
+                dev_err(&ps2dev->serio->dev,
+                        "Failed to enable keyboard on %s\n",
                        ps2dev->serio->phys);
                return -1;
        }
@@ -1070,9 +1074,13 @@ static void atkbd_set_device_attrs(struct atkbd *atkbd)
        input_dev->keycodesize = sizeof(unsigned short);
        input_dev->keycodemax = ARRAY_SIZE(atkbd_set2_keycode);
-        for (i = 0; i < ATKBD_KEYMAP_SIZE; i++)
+        for (i = 0; i < ATKBD_KEYMAP_SIZE; i++) {
-                if (atkbd->keycode[i] && atkbd->keycode[i] < ATKBD_SPECIAL)
+                if (atkbd->keycode[i] != KEY_RESERVED &&
+                    atkbd->keycode[i] != ATKBD_KEY_NULL &&
+                    atkbd->keycode[i] < ATKBD_SPECIAL) {
                        __set_bit(atkbd->keycode[i], input_dev->keybit);
+                }
+        }
 }
 /*
@@ -1100,12 +1108,14 @@ static int atkbd_connect(struct serio *serio, struct serio_driver *drv)
        switch (serio->id.type) {
-                case SERIO_8042_XL:
+        case SERIO_8042_XL:
-                        atkbd->translated = 1;
+                atkbd->translated = true;
-                case SERIO_8042:
+                /* Fall through */
-                        if (serio->write)
-                                atkbd->write = 1;
+        case SERIO_8042:
-                        break;
+                if (serio->write)
+                        atkbd->write = true;
+                break;
        }
        atkbd->softraw = atkbd_softraw;
@@ -1113,7 +1123,7 @@ static int atkbd_connect(struct serio *serio, struct serio_driver *drv)
        atkbd->scroll = atkbd_scroll;
        if (atkbd->softrepeat)
-                atkbd->softraw = 1;
+                atkbd->softraw = true;
        serio_set_drvdata(serio, atkbd);
@@ -1172,7 +1182,8 @@ static int atkbd_reconnect(struct serio *serio)
        int retval = -1;
        if (!atkbd || !drv) {
-                printk(KERN_DEBUG "atkbd: reconnect request, but serio is disconnected, ignoring...\n");
+                dev_dbg(&serio->dev,
+                        "reconnect request, but serio is disconnected, ignoring...\n");
                return -1;
        }
@@ -1286,7 +1297,8 @@ static ssize_t atkbd_set_extra(struct atkbd *atkbd, const char *buf, size_t coun
        struct input_dev *old_dev, *new_dev;
        unsigned long value;
        int err;
-        unsigned char old_extra, old_set;
+        bool old_extra;
+        unsigned char old_set;
        if (!atkbd->write)
                return -EIO;
@@ -1369,7 +1381,7 @@ static ssize_t atkbd_set_scroll(struct atkbd *atkbd, const char *buf, size_t cou
        struct input_dev *old_dev, *new_dev;
        unsigned long value;
        int err;
-        unsigned char old_scroll;
+        bool old_scroll;
        if (strict_strtoul(buf, 10, &value) || value > 1)
                return -EINVAL;
@@ -1413,7 +1425,8 @@ static ssize_t atkbd_set_set(struct atkbd *atkbd, const char *buf, size_t count)
        struct input_dev *old_dev, *new_dev;
        unsigned long value;
        int err;
-        unsigned char old_set, old_extra;
+        unsigned char old_set;
+        bool old_extra;
        if (!atkbd->write)
                return -EIO;
@@ -1463,7 +1476,7 @@ static ssize_t atkbd_set_softrepeat(struct atkbd *atkbd, const char *buf, size_t
        struct input_dev *old_dev, *new_dev;
        unsigned long value;
        int err;
-        unsigned char old_softrepeat, old_softraw;
+        bool old_softrepeat, old_softraw;
        if (!atkbd->write)
                return -EIO;
@@ -1483,7 +1496,7 @@ static ssize_t atkbd_set_softrepeat(struct atkbd *atkbd, const char *buf, size_t
                atkbd->dev = new_dev;
                atkbd->softrepeat = value;
                if (atkbd->softrepeat)
-                        atkbd->softraw = 1;
+                        atkbd->softraw = true;
                atkbd_set_device_attrs(atkbd);
                err = input_register_device(atkbd->dev);
@@ -1513,7 +1526,7 @@ static ssize_t atkbd_set_softraw(struct atkbd *atkbd, const char *buf, size_t co
        struct input_dev *old_dev, *new_dev;
        unsigned long value;
        int err;
-        unsigned char old_softraw;
+        bool old_softraw;
        if (strict_strtoul(buf, 10, &value) || value > 1)
                return -EINVAL;
diff --git a/drivers/input/keyboard/ep93xx_keypad.c b/drivers/input/keyboard/ep93xx_keypad.c
index e45740429f7..bd25a3af166 100644
--- a/drivers/input/keyboard/ep93xx_keypad.c
+++ b/drivers/input/keyboard/ep93xx_keypad.c
@@ -69,7 +69,7 @@ struct ep93xx_keypad {
        void __iomem *mmio_base;
-        unsigned int matrix_keycodes[EP93XX_MATRIX_SIZE];
+        unsigned short keycodes[EP93XX_MATRIX_SIZE];
        int key1;
        int key2;
@@ -79,24 +79,6 @@ struct ep93xx_keypad {
        bool enabled;
 };
-static void ep93xx_keypad_build_keycode(struct ep93xx_keypad *keypad)
-{
-        struct ep93xx_keypad_platform_data *pdata = keypad->pdata;
-        struct input_dev *input_dev = keypad->input_dev;
-        unsigned int *key;
-        int i;
-        key = &pdata->matrix_key_map[0];
-        for (i = 0; i < pdata->matrix_key_map_size; i++, key++) {
-                int row = KEY_ROW(*key);
-                int col = KEY_COL(*key);
-                int code = KEY_VAL(*key);
-                keypad->matrix_keycodes[(row << 3) + col] = code;
-                __set_bit(code, input_dev->keybit);
-        }
-}
 static irqreturn_t ep93xx_keypad_irq_handler(int irq, void *dev_id)
 {
        struct ep93xx_keypad *keypad = dev_id;
@@ -107,10 +89,10 @@ static irqreturn_t ep93xx_keypad_irq_handler(int irq, void *dev_id)
        status = __raw_readl(keypad->mmio_base + KEY_REG);
        keycode = (status & KEY_REG_KEY1_MASK) >> KEY_REG_KEY1_SHIFT;
-        key1 = keypad->matrix_keycodes[keycode];
+        key1 = keypad->keycodes[keycode];
        keycode = (status & KEY_REG_KEY2_MASK) >> KEY_REG_KEY2_SHIFT;
-        key2 = keypad->matrix_keycodes[keycode];
+        key2 = keypad->keycodes[keycode];
        if (status & KEY_REG_2KEYS) {
                if (keypad->key1 && key1 != keypad->key1 && key2 != keypad->key1)
@@ -256,6 +238,7 @@ static int ep93xx_keypad_resume(struct platform_device *pdev)
 static int __devinit ep93xx_keypad_probe(struct platform_device *pdev)
 {
        struct ep93xx_keypad *keypad;
+        const struct matrix_keymap_data *keymap_data;
        struct input_dev *input_dev;
        struct resource *res;
        int err;
@@ -270,6 +253,12 @@ static int __devinit ep93xx_keypad_probe(struct platform_device *pdev)
                goto failed_free;
        }
+        keymap_data = keypad->pdata->keymap_data;
+        if (!keymap_data) {
+                err = -EINVAL;
+                goto failed_free;
+        }
        keypad->irq = platform_get_irq(pdev, 0);
        if (!keypad->irq) {
                err = -ENXIO;
@@ -317,9 +306,9 @@ static int __devinit ep93xx_keypad_probe(struct platform_device *pdev)
        input_dev->open = ep93xx_keypad_open;
        input_dev->close = ep93xx_keypad_close;
        input_dev->dev.parent = &pdev->dev;
-        input_dev->keycode = keypad->matrix_keycodes;
+        input_dev->keycode = keypad->keycodes;
-        input_dev->keycodesize = sizeof(keypad->matrix_keycodes[0]);
+        input_dev->keycodesize = sizeof(keypad->keycodes[0]);
-        input_dev->keycodemax = ARRAY_SIZE(keypad->matrix_keycodes);
+        input_dev->keycodemax = ARRAY_SIZE(keypad->keycodes);
        input_set_drvdata(input_dev, keypad);
@@ -327,7 +316,8 @@ static int __devinit ep93xx_keypad_probe(struct platform_device *pdev)
        if (keypad->pdata->flags & EP93XX_KEYPAD_AUTOREPEAT)
                input_dev->evbit[0] |= BIT_MASK(EV_REP);
-        ep93xx_keypad_build_keycode(keypad);
+        matrix_keypad_build_keymap(keymap_data, 3,
+                                   input_dev->keycode, input_dev->keybit);
        platform_set_drvdata(pdev, keypad);
        err = request_irq(keypad->irq, ep93xx_keypad_irq_handler,
diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c
index 1aff3b76eff..2b708aa8555 100644
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
@@ -30,13 +30,289 @@ struct gpio_button_data {
        struct input_dev *input;
        struct timer_list timer;
        struct work_struct work;
+        bool disabled;
 };
 struct gpio_keys_drvdata {
        struct input_dev *input;
+        struct mutex disable_lock;
+        unsigned int n_buttons;
        struct gpio_button_data data[0];
 };
+/*
+ * SYSFS interface for enabling/disabling keys and switches:
+ *
+ * There are 4 attributes under /sys/devices/platform/gpio-keys/
+ *      keys [ro]              - bitmap of keys (EV_KEY) which can be
+ *                               disabled
+ *      switches [ro]          - bitmap of switches (EV_SW) which can be
+ *                               disabled
+ *      disabled_keys [rw]     - bitmap of keys currently disabled
+ *      disabled_switches [rw] - bitmap of switches currently disabled
+ *
+ * Userland can change these values and hence disable event generation
+ * for each key (or switch). Disabling a key means its interrupt line
+ * is disabled.
+ *
+ * For example, if we have following switches set up as gpio-keys:
+ *      SW_DOCK = 5
+ *      SW_CAMERA_LENS_COVER = 9
+ *      SW_KEYPAD_SLIDE = 10
+ *      SW_FRONT_PROXIMITY = 11
+ * This is read from switches:
+ *      11-9,5
+ * Next we want to disable proximity (11) and dock (5), we write:
+ *      11,5
+ * to file disabled_switches. Now proximity and dock IRQs are disabled.
+ * This can be verified by reading the file disabled_switches:
+ *      11,5
+ * If we now want to enable proximity (11) switch we write:
+ *      5
+ * to disabled_switches.
+ *
+ * We can disable only those keys which don't allow sharing the irq.
+ */
+/**
+ * get_n_events_by_type() - returns maximum number of events per @type
+ * @type: type of button (%EV_KEY, %EV_SW)
+ *
+ * Return value of this function can be used to allocate bitmap
+ * large enough to hold all bits for given type.
+ */
+static inline int get_n_events_by_type(int type)
+{
+        BUG_ON(type != EV_SW && type != EV_KEY);
+        return (type == EV_KEY) ? KEY_CNT : SW_CNT;
+}
+/**
+ * gpio_keys_disable_button() - disables given GPIO button
+ * @bdata: button data for button to be disabled
+ *
+ * Disables button pointed by @bdata. This is done by masking
+ * IRQ line. After this function is called, button won't generate
+ * input events anymore. Note that one can only disable buttons
+ * that don't share IRQs.
+ *
+ * Make sure that @bdata->disable_lock is locked when entering
+ * this function to avoid races when concurrent threads are
+ * disabling buttons at the same time.
+ */
+static void gpio_keys_disable_button(struct gpio_button_data *bdata)
+{
+        if (!bdata->disabled) {
+                /*
+                 * Disable IRQ and possible debouncing timer.
+                 */
+                disable_irq(gpio_to_irq(bdata->button->gpio));
+                if (bdata->button->debounce_interval)
+                        del_timer_sync(&bdata->timer);
+                bdata->disabled = true;
+        }
+}
+/**
+ * gpio_keys_enable_button() - enables given GPIO button
+ * @bdata: button data for button to be disabled
+ *
+ * Enables given button pointed by @bdata.
+ *
+ * Make sure that @bdata->disable_lock is locked when entering
+ * this function to avoid races with concurrent threads trying
+ * to enable the same button at the same time.
+ */
+static void gpio_keys_enable_button(struct gpio_button_data *bdata)
+{
+        if (bdata->disabled) {
+                enable_irq(gpio_to_irq(bdata->button->gpio));
+                bdata->disabled = false;
+        }
+}
+/**
+ * gpio_keys_attr_show_helper() - fill in stringified bitmap of buttons
+ * @ddata: pointer to drvdata
+ * @buf: buffer where stringified bitmap is written
+ * @type: button type (%EV_KEY, %EV_SW)
+ * @only_disabled: does caller want only those buttons that are
+ *                 currently disabled or all buttons that can be
+ *                 disabled
+ *
+ * This function writes buttons that can be disabled to @buf. If
+ * @only_disabled is true, then @buf contains only those buttons
+ * that are currently disabled. Returns 0 on success or negative
+ * errno on failure.
+ */
+static ssize_t gpio_keys_attr_show_helper(struct gpio_keys_drvdata *ddata,
+                                          char *buf, unsigned int type,
+                                          bool only_disabled)
+{
+        int n_events = get_n_events_by_type(type);
+        unsigned long *bits;
+        ssize_t ret;
+        int i;
+        bits = kcalloc(BITS_TO_LONGS(n_events), sizeof(*bits), GFP_KERNEL);
+        if (!bits)
+                return -ENOMEM;
+        for (i = 0; i < ddata->n_buttons; i++) {
+                struct gpio_button_data *bdata = &ddata->data[i];
+                if (bdata->button->type != type)
+                        continue;
+                if (only_disabled && !bdata->disabled)
+                        continue;
+                __set_bit(bdata->button->code, bits);
+        }
+        ret = bitmap_scnlistprintf(buf, PAGE_SIZE - 2, bits, n_events);
+        buf[ret++] = '\n';
+        buf[ret] = '\0';
+        kfree(bits);
+        return ret;
+}
+/**
+ * gpio_keys_attr_store_helper() - enable/disable buttons based on given bitmap
+ * @ddata: pointer to drvdata
+ * @buf: buffer from userspace that contains stringified bitmap
+ * @type: button type (%EV_KEY, %EV_SW)
+ *
+ * This function parses stringified bitmap from @buf and disables/enables
+ * GPIO buttons accordinly. Returns 0 on success and negative error
+ * on failure.
+ */
+static ssize_t gpio_keys_attr_store_helper(struct gpio_keys_drvdata *ddata,
+                                           const char *buf, unsigned int type)
+{
+        int n_events = get_n_events_by_type(type);
+        unsigned long *bits;
+        ssize_t error;
+        int i;
+        bits = kcalloc(BITS_TO_LONGS(n_events), sizeof(*bits), GFP_KERNEL);
+        if (!bits)
+                return -ENOMEM;
+        error = bitmap_parselist(buf, bits, n_events);
+        if (error)
+                goto out;
+        /* First validate */
+        for (i = 0; i < ddata->n_buttons; i++) {
+                struct gpio_button_data *bdata = &ddata->data[i];
+                if (bdata->button->type != type)
+                        continue;
+                if (test_bit(bdata->button->code, bits) &&
+                    !bdata->button->can_disable) {
+                        error = -EINVAL;
+                        goto out;
+                }
+        }
+        mutex_lock(&ddata->disable_lock);
+        for (i = 0; i < ddata->n_buttons; i++) {
+                struct gpio_button_data *bdata = &ddata->data[i];
+                if (bdata->button->type != type)
+                        continue;
+                if (test_bit(bdata->button->code, bits))
+                        gpio_keys_disable_button(bdata);
+                else
+                        gpio_keys_enable_button(bdata);
+        }
+        mutex_unlock(&ddata->disable_lock);
+out:
+        kfree(bits);
+        return error;
+}
+#define ATTR_SHOW_FN(name, type, only_disabled)                         \
+static ssize_t gpio_keys_show_##name(struct device *dev,                \
+                                     struct device_attribute *attr,     \
+                                     char *buf)                         \
+{                                                                       \
+        struct platform_device *pdev = to_platform_device(dev);         \
+        struct gpio_keys_drvdata *ddata = platform_get_drvdata(pdev);   \
+                                                                        \
+        return gpio_keys_attr_show_helper(ddata, buf,                   \
+                                          type, only_disabled);         \
+}
+ATTR_SHOW_FN(keys, EV_KEY, false);
+ATTR_SHOW_FN(switches, EV_SW, false);
+ATTR_SHOW_FN(disabled_keys, EV_KEY, true);
+ATTR_SHOW_FN(disabled_switches, EV_SW, true);
+/*
+ * ATTRIBUTES:
+ *
+ * /sys/devices/platform/gpio-keys/keys [ro]
+ * /sys/devices/platform/gpio-keys/switches [ro]
+ */
+static DEVICE_ATTR(keys, S_IRUGO, gpio_keys_show_keys, NULL);
+static DEVICE_ATTR(switches, S_IRUGO, gpio_keys_show_switches, NULL);
+#define ATTR_STORE_FN(name, type)                                       \
+static ssize_t gpio_keys_store_##name(struct device *dev,               \
+                                      struct device_attribute *attr,    \
+                                      const char *buf,                  \
+                                      size_t count)                     \
+{                                                                       \
+        struct platform_device *pdev = to_platform_device(dev);         \
+        struct gpio_keys_drvdata *ddata = platform_get_drvdata(pdev);   \
+        ssize_t error;                                                  \
+                                                                        \
+        error = gpio_keys_attr_store_helper(ddata, buf, type);          \
+        if (error)                                                      \
+                return error;                                           \
+                                                                        \
+        return count;                                                   \
+}
+ATTR_STORE_FN(disabled_keys, EV_KEY);
+ATTR_STORE_FN(disabled_switches, EV_SW);
+/*
+ * ATTRIBUTES:
+ *
+ * /sys/devices/platform/gpio-keys/disabled_keys [rw]
+ * /sys/devices/platform/gpio-keys/disables_switches [rw]
+ */
+static DEVICE_ATTR(disabled_keys, S_IWUSR | S_IRUGO,
+                   gpio_keys_show_disabled_keys,
+                   gpio_keys_store_disabled_keys);
+static DEVICE_ATTR(disabled_switches, S_IWUSR | S_IRUGO,
+                   gpio_keys_show_disabled_switches,
+                   gpio_keys_store_disabled_switches);
+static struct attribute *gpio_keys_attrs[] = {
+        &dev_attr_keys.attr,
+        &dev_attr_switches.attr,
+        &dev_attr_disabled_keys.attr,
+        &dev_attr_disabled_switches.attr,
+        NULL,
+};
+static struct attribute_group gpio_keys_attr_group = {
+        .attrs = gpio_keys_attrs,
+};
 static void gpio_keys_report_event(struct gpio_button_data *bdata)
 {
        struct gpio_keys_button *button = bdata->button;
@@ -79,11 +355,13 @@ static irqreturn_t gpio_keys_isr(int irq, void *dev_id)
        return IRQ_HANDLED;
 }
-static int __devinit gpio_keys_setup_key(struct device *dev,
+static int __devinit gpio_keys_setup_key(struct platform_device *pdev,
                                         struct gpio_button_data *bdata,
                                         struct gpio_keys_button *button)
 {
        char *desc = button->desc ? button->desc : "gpio_keys";
+        struct device *dev = &pdev->dev;
+        unsigned long irqflags;
        int irq, error;
        setup_timer(&bdata->timer, gpio_keys_timer, (unsigned long)bdata);
@@ -112,10 +390,15 @@ static int __devinit gpio_keys_setup_key(struct device *dev,
                goto fail3;
        }
-        error = request_irq(irq, gpio_keys_isr,
+        irqflags = IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING;
-                            IRQF_SHARED |
+        /*
-                            IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
+         * If platform has specified that the button can be disabled,
-                            desc, bdata);
+         * we don't want it to share the interrupt line.
+         */
+        if (!button->can_disable)
+                irqflags |= IRQF_SHARED;
+        error = request_irq(irq, gpio_keys_isr, irqflags, desc, bdata);
        if (error) {
                dev_err(dev, "Unable to claim irq %d; error %d\n",
                        irq, error);
@@ -149,6 +432,10 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)
                goto fail1;
        }
+        ddata->input = input;
+        ddata->n_buttons = pdata->nbuttons;
+        mutex_init(&ddata->disable_lock);
        platform_set_drvdata(pdev, ddata);
        input->name = pdev->name;
@@ -164,8 +451,6 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)
        if (pdata->rep)
                __set_bit(EV_REP, input->evbit);
-        ddata->input = input;
        for (i = 0; i < pdata->nbuttons; i++) {
                struct gpio_keys_button *button = &pdata->buttons[i];
                struct gpio_button_data *bdata = &ddata->data[i];
@@ -174,7 +459,7 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)
                bdata->input = input;
                bdata->button = button;
-                error = gpio_keys_setup_key(dev, bdata, button);
+                error = gpio_keys_setup_key(pdev, bdata, button);
                if (error)
                        goto fail2;
@@ -184,13 +469,20 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)
                input_set_capability(input, type, button->code);
        }
-        error = input_register_device(input);
+        error = sysfs_create_group(&pdev->dev.kobj, &gpio_keys_attr_group);
        if (error) {
-                dev_err(dev, "Unable to register input device, "
+                dev_err(dev, "Unable to export keys/switches, error: %d\n",
-                        "error: %d\n", error);
+                        error);
                goto fail2;
        }
+        error = input_register_device(input);
+        if (error) {
+                dev_err(dev, "Unable to register input device, error: %d\n",
+                        error);
+                goto fail3;
+        }
        /* get current state of buttons */
        for (i = 0; i < pdata->nbuttons; i++)
                gpio_keys_report_event(&ddata->data[i]);
@@ -200,6 +492,8 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)
        return 0;
+ fail3:
+        sysfs_remove_group(&pdev->dev.kobj, &gpio_keys_attr_group);
 fail2:
        while (--i >= 0) {
                free_irq(gpio_to_irq(pdata->buttons[i].gpio), &ddata->data[i]);
@@ -224,6 +518,8 @@ static int __devexit gpio_keys_remove(struct platform_device *pdev)
        struct input_dev *input = ddata->input;
        int i;
+        sysfs_remove_group(&pdev->dev.kobj, &gpio_keys_attr_group);
        device_init_wakeup(&pdev->dev, 0);
        for (i = 0; i < pdata->nbuttons; i++) {
diff --git a/drivers/input/keyboard/imx_keypad.c b/drivers/input/keyboard/imx_keypad.c
new file mode 100644
index 00000000000..2ee5b798024
--- /dev/null
+++ b/drivers/input/keyboard/imx_keypad.c
@@ -0,0 +1,594 @@
+/*
+ * Driver for the IMX keypad port.
+ * Copyright (C) 2009 Alberto Panizzo <maramaopercheseimorto@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * <<Power management needs to be implemented>>.
+ */
+#include <linux/clk.h>
+#include <linux/delay.h>
+#include <linux/device.h>
+#include <linux/err.h>
+#include <linux/init.h>
+#include <linux/input/matrix_keypad.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/jiffies.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/timer.h>
+/*
+ * Keypad Controller registers (halfword)
+ */
+#define KPCR            0x00 /* Keypad Control Register */
+#define KPSR            0x02 /* Keypad Status Register */
+#define KBD_STAT_KPKD   (0x1 << 0) /* Key Press Interrupt Status bit (w1c) */
+#define KBD_STAT_KPKR   (0x1 << 1) /* Key Release Interrupt Status bit (w1c) */
+#define KBD_STAT_KDSC   (0x1 << 2) /* Key Depress Synch Chain Status bit (w1c)*/
+#define KBD_STAT_KRSS   (0x1 << 3) /* Key Release Synch Status bit (w1c)*/
+#define KBD_STAT_KDIE   (0x1 << 8) /* Key Depress Interrupt Enable Status bit */
+#define KBD_STAT_KRIE   (0x1 << 9) /* Key Release Interrupt Enable */
+#define KBD_STAT_KPPEN  (0x1 << 10) /* Keypad Clock Enable */
+#define KDDR            0x04 /* Keypad Data Direction Register */
+#define KPDR            0x06 /* Keypad Data Register */
+#define MAX_MATRIX_KEY_ROWS     8
+#define MAX_MATRIX_KEY_COLS     8
+#define MATRIX_ROW_SHIFT        3
+#define MAX_MATRIX_KEY_NUM      (MAX_MATRIX_KEY_ROWS * MAX_MATRIX_KEY_COLS)
+struct imx_keypad {
+        struct clk *clk;
+        struct input_dev *input_dev;
+        void __iomem *mmio_base;
+        int                     irq;
+        struct timer_list       check_matrix_timer;
+        /*
+         * The matrix is stable only if no changes are detected after
+         * IMX_KEYPAD_SCANS_FOR_STABILITY scans
+         */
+#define IMX_KEYPAD_SCANS_FOR_STABILITY 3
+        int                     stable_count;
+        bool                    enabled;
+        /* Masks for enabled rows/cols */
+        unsigned short          rows_en_mask;
+        unsigned short          cols_en_mask;
+        unsigned short          keycodes[MAX_MATRIX_KEY_NUM];
+        /*
+         * Matrix states:
+         * -stable: achieved after a complete debounce process.
+         * -unstable: used in the debouncing process.
+         */
+        unsigned short          matrix_stable_state[MAX_MATRIX_KEY_COLS];
+        unsigned short          matrix_unstable_state[MAX_MATRIX_KEY_COLS];
+};
+/* Scan the matrix and return the new state in *matrix_volatile_state. */
+static void imx_keypad_scan_matrix(struct imx_keypad *keypad,
+                                  unsigned short *matrix_volatile_state)
+{
+        int col;
+        unsigned short reg_val;
+        for (col = 0; col < MAX_MATRIX_KEY_COLS; col++) {
+                if ((keypad->cols_en_mask & (1 << col)) == 0)
+                        continue;
+                /*
+                 * Discharge keypad capacitance:
+                 * 2. write 1s on column data.
+                 * 3. configure columns as totem-pole to discharge capacitance.
+                 * 4. configure columns as open-drain.
+                 */
+                reg_val = readw(keypad->mmio_base + KPDR);
+                reg_val |= 0xff00;
+                writew(reg_val, keypad->mmio_base + KPDR);
+                reg_val = readw(keypad->mmio_base + KPCR);
+                reg_val &= ~((keypad->cols_en_mask & 0xff) << 8);
+                writew(reg_val, keypad->mmio_base + KPCR);
+                udelay(2);
+                reg_val = readw(keypad->mmio_base + KPCR);
+                reg_val |= (keypad->cols_en_mask & 0xff) << 8;
+                writew(reg_val, keypad->mmio_base + KPCR);
+                /*
+                 * 5. Write a single column to 0, others to 1.
+                 * 6. Sample row inputs and save data.
+                 * 7. Repeat steps 2 - 6 for remaining columns.
+                 */
+                reg_val = readw(keypad->mmio_base + KPDR);
+                reg_val &= ~(1 << (8 + col));
+                writew(reg_val, keypad->mmio_base + KPDR);
+                /*
+                 * Delay added to avoid propagating the 0 from column to row
+                 * when scanning.
+                 */
+                udelay(5);
+                /*
+                 * 1s in matrix_volatile_state[col] means key pressures
+                 * throw data from non enabled rows.
+                 */
+                reg_val = readw(keypad->mmio_base + KPDR);
+                matrix_volatile_state[col] = (~reg_val) & keypad->rows_en_mask;
+        }
+        /*
+         * Return in standby mode:
+         * 9. write 0s to columns
+         */
+        reg_val = readw(keypad->mmio_base + KPDR);
+        reg_val &= 0x00ff;
+        writew(reg_val, keypad->mmio_base + KPDR);
+}
+/*
+ * Compare the new matrix state (volatile) with the stable one stored in
+ * keypad->matrix_stable_state and fire events if changes are detected.
+ */
+static void imx_keypad_fire_events(struct imx_keypad *keypad,
+                                   unsigned short *matrix_volatile_state)
+{
+        struct input_dev *input_dev = keypad->input_dev;
+        int row, col;
+        for (col = 0; col < MAX_MATRIX_KEY_COLS; col++) {
+                unsigned short bits_changed;
+                int code;
+                if ((keypad->cols_en_mask & (1 << col)) == 0)
+                        continue; /* Column is not enabled */
+                bits_changed = keypad->matrix_stable_state[col] ^
+                                                matrix_volatile_state[col];
+                if (bits_changed == 0)
+                        continue; /* Column does not contain changes */
+                for (row = 0; row < MAX_MATRIX_KEY_ROWS; row++) {
+                        if ((keypad->rows_en_mask & (1 << row)) == 0)
+                                continue; /* Row is not enabled */
+                        if ((bits_changed & (1 << row)) == 0)
+                                continue; /* Row does not contain changes */
+                        code = MATRIX_SCAN_CODE(row, col, MATRIX_ROW_SHIFT);
+                        input_event(input_dev, EV_MSC, MSC_SCAN, code);
+                        input_report_key(input_dev, keypad->keycodes[code],
+                                matrix_volatile_state[col] & (1 << row));
+                        dev_dbg(&input_dev->dev, "Event code: %d, val: %d",
+                                keypad->keycodes[code],
+                                matrix_volatile_state[col] & (1 << row));
+                }
+        }
+        input_sync(input_dev);
+}
+/*
+ * imx_keypad_check_for_events is the timer handler.
+ */
+static void imx_keypad_check_for_events(unsigned long data)
+{
+        struct imx_keypad *keypad = (struct imx_keypad *) data;
+        unsigned short matrix_volatile_state[MAX_MATRIX_KEY_COLS];
+        unsigned short reg_val;
+        bool state_changed, is_zero_matrix;
+        int i;
+        memset(matrix_volatile_state, 0, sizeof(matrix_volatile_state));
+        imx_keypad_scan_matrix(keypad, matrix_volatile_state);
+        state_changed = false;
+        for (i = 0; i < MAX_MATRIX_KEY_COLS; i++) {
+                if ((keypad->cols_en_mask & (1 << i)) == 0)
+                        continue;
+                if (keypad->matrix_unstable_state[i] ^ matrix_volatile_state[i]) {
+                        state_changed = true;
+                        break;
+                }
+        }
+        /*
+         * If the matrix state is changed from the previous scan
+         *   (Re)Begin the debouncing process, saving the new state in
+         *    keypad->matrix_unstable_state.
+         * else
+         *   Increase the count of number of scans with a stable state.
+         */
+        if (state_changed) {
+                memcpy(keypad->matrix_unstable_state, matrix_volatile_state,
+                        sizeof(matrix_volatile_state));
+                keypad->stable_count = 0;
+        } else
+                keypad->stable_count++;
+        /*
+         * If the matrix is not as stable as we want reschedule scan
+         * in the near future.
+         */
+        if (keypad->stable_count < IMX_KEYPAD_SCANS_FOR_STABILITY) {
+                mod_timer(&keypad->check_matrix_timer,
+                          jiffies + msecs_to_jiffies(10));
+                return;
+        }
+        /*
+         * If the matrix state is stable, fire the events and save the new
+         * stable state. Note, if the matrix is kept stable for longer
+         * (keypad->stable_count > IMX_KEYPAD_SCANS_FOR_STABILITY) all
+         * events have already been generated.
+         */
+        if (keypad->stable_count == IMX_KEYPAD_SCANS_FOR_STABILITY) {
+                imx_keypad_fire_events(keypad, matrix_volatile_state);
+                memcpy(keypad->matrix_stable_state, matrix_volatile_state,
+                        sizeof(matrix_volatile_state));
+        }
+        is_zero_matrix = true;
+        for (i = 0; i < MAX_MATRIX_KEY_COLS; i++) {
+                if (matrix_volatile_state[i] != 0) {
+                        is_zero_matrix = false;
+                        break;
+                }
+        }
+        if (is_zero_matrix) {
+                /*
+                 * All keys have been released. Enable only the KDI
+                 * interrupt for future key presses (clear the KDI
+                 * status bit and its sync chain before that).
+                 */
+                reg_val = readw(keypad->mmio_base + KPSR);
+                reg_val |= KBD_STAT_KPKD | KBD_STAT_KDSC;
+                writew(reg_val, keypad->mmio_base + KPSR);
+                reg_val = readw(keypad->mmio_base + KPSR);
+                reg_val |= KBD_STAT_KDIE;
+                reg_val &= ~KBD_STAT_KRIE;
+                writew(reg_val, keypad->mmio_base + KPSR);
+        } else {
+                /*
+                 * Some keys are still pressed. Schedule a rescan in
+                 * attempt to detect multiple key presses and enable
+                 * the KRI interrupt to react quickly to key release
+                 * event.
+                 */
+                mod_timer(&keypad->check_matrix_timer,
+                          jiffies + msecs_to_jiffies(60));
+                reg_val = readw(keypad->mmio_base + KPSR);
+                reg_val |= KBD_STAT_KPKR | KBD_STAT_KRSS;
+                writew(reg_val, keypad->mmio_base + KPSR);
+                reg_val = readw(keypad->mmio_base + KPSR);
+                reg_val |= KBD_STAT_KRIE;
+                reg_val &= ~KBD_STAT_KDIE;
+                writew(reg_val, keypad->mmio_base + KPSR);
+        }
+}
+static irqreturn_t imx_keypad_irq_handler(int irq, void *dev_id)
+{
+        struct imx_keypad *keypad = dev_id;
+        unsigned short reg_val;
+        reg_val = readw(keypad->mmio_base + KPSR);
+        /* Disable both interrupt types */
+        reg_val &= ~(KBD_STAT_KRIE | KBD_STAT_KDIE);
+        /* Clear interrupts status bits */
+        reg_val |= KBD_STAT_KPKR | KBD_STAT_KPKD;
+        writew(reg_val, keypad->mmio_base + KPSR);
+        if (keypad->enabled) {
+                /* The matrix is supposed to be changed */
+                keypad->stable_count = 0;
+                /* Schedule the scanning procedure near in the future */
+                mod_timer(&keypad->check_matrix_timer,
+                          jiffies + msecs_to_jiffies(2));
+        }
+        return IRQ_HANDLED;
+}
+static void imx_keypad_config(struct imx_keypad *keypad)
+{
+        unsigned short reg_val;
+        /*
+         * Include enabled rows in interrupt generation (KPCR[7:0])
+         * Configure keypad columns as open-drain (KPCR[15:8])
+         */
+        reg_val = readw(keypad->mmio_base + KPCR);
+        reg_val |= keypad->rows_en_mask & 0xff;         /* rows */
+        reg_val |= (keypad->cols_en_mask & 0xff) << 8;  /* cols */
+        writew(reg_val, keypad->mmio_base + KPCR);
+        /* Write 0's to KPDR[15:8] (Colums) */
+        reg_val = readw(keypad->mmio_base + KPDR);
+        reg_val &= 0x00ff;
+        writew(reg_val, keypad->mmio_base + KPDR);
+        /* Configure columns as output, rows as input (KDDR[15:0]) */
+        writew(0xff00, keypad->mmio_base + KDDR);
+        /*
+         * Clear Key Depress and Key Release status bit.
+         * Clear both synchronizer chain.
+         */
+        reg_val = readw(keypad->mmio_base + KPSR);
+        reg_val |= KBD_STAT_KPKR | KBD_STAT_KPKD |
+                   KBD_STAT_KDSC | KBD_STAT_KRSS;
+        writew(reg_val, keypad->mmio_base + KPSR);
+        /* Enable KDI and disable KRI (avoid false release events). */
+        reg_val |= KBD_STAT_KDIE;
+        reg_val &= ~KBD_STAT_KRIE;
+        writew(reg_val, keypad->mmio_base + KPSR);
+}
+static void imx_keypad_inhibit(struct imx_keypad *keypad)
+{
+        unsigned short reg_val;
+        /* Inhibit KDI and KRI interrupts. */
+        reg_val = readw(keypad->mmio_base + KPSR);
+        reg_val &= ~(KBD_STAT_KRIE | KBD_STAT_KDIE);
+        writew(reg_val, keypad->mmio_base + KPSR);
+        /* Colums as open drain and disable all rows */
+        writew(0xff00, keypad->mmio_base + KPCR);
+}
+static void imx_keypad_close(struct input_dev *dev)
+{
+        struct imx_keypad *keypad = input_get_drvdata(dev);
+        dev_dbg(&dev->dev, ">%s\n", __func__);
+        /* Mark keypad as being inactive */
+        keypad->enabled = false;
+        synchronize_irq(keypad->irq);
+        del_timer_sync(&keypad->check_matrix_timer);
+        imx_keypad_inhibit(keypad);
+        /* Disable clock unit */
+        clk_disable(keypad->clk);
+}
+static int imx_keypad_open(struct input_dev *dev)
+{
+        struct imx_keypad *keypad = input_get_drvdata(dev);
+        dev_dbg(&dev->dev, ">%s\n", __func__);
+        /* We became active from now */
+        keypad->enabled = true;
+        /* Enable the kpp clock */
+        clk_enable(keypad->clk);
+        imx_keypad_config(keypad);
+        /* Sanity control, not all the rows must be actived now. */
+        if ((readw(keypad->mmio_base + KPDR) & keypad->rows_en_mask) == 0) {
+                dev_err(&dev->dev,
+                        "too many keys pressed, control pins initialisation\n");
+                goto open_err;
+        }
+        return 0;
+open_err:
+        imx_keypad_close(dev);
+        return -EIO;
+}
+static int __devinit imx_keypad_probe(struct platform_device *pdev)
+{
+        const struct matrix_keymap_data *keymap_data = pdev->dev.platform_data;
+        struct imx_keypad *keypad;
+        struct input_dev *input_dev;
+        struct resource *res;
+        int irq, error, i;
+        if (keymap_data == NULL) {
+                dev_err(&pdev->dev, "no keymap defined\n");
+                return -EINVAL;
+        }
+        irq = platform_get_irq(pdev, 0);
+        if (irq < 0) {
+                dev_err(&pdev->dev, "no irq defined in platform data\n");
+                return -EINVAL;
+        }
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (res == NULL) {
+                dev_err(&pdev->dev, "no I/O memory defined in platform data\n");
+                return -EINVAL;
+        }
+        res = request_mem_region(res->start, resource_size(res), pdev->name);
+        if (res == NULL) {
+                dev_err(&pdev->dev, "failed to request I/O memory\n");
+                return -EBUSY;
+        }
+        input_dev = input_allocate_device();
+        if (!input_dev) {
+                dev_err(&pdev->dev, "failed to allocate the input device\n");
+                error = -ENOMEM;
+                goto failed_rel_mem;
+        }
+        keypad = kzalloc(sizeof(struct imx_keypad), GFP_KERNEL);
+        if (!keypad) {
+                dev_err(&pdev->dev, "not enough memory for driver data\n");
+                error = -ENOMEM;
+                goto failed_free_input;
+        }
+        keypad->input_dev = input_dev;
+        keypad->irq = irq;
+        keypad->stable_count = 0;
+        setup_timer(&keypad->check_matrix_timer,
+                    imx_keypad_check_for_events, (unsigned long) keypad);
+        keypad->mmio_base = ioremap(res->start, resource_size(res));
+        if (keypad->mmio_base == NULL) {
+                dev_err(&pdev->dev, "failed to remap I/O memory\n");
+                error = -ENOMEM;
+                goto failed_free_priv;
+        }
+        keypad->clk = clk_get(&pdev->dev, "kpp");
+        if (IS_ERR(keypad->clk)) {
+                dev_err(&pdev->dev, "failed to get keypad clock\n");
+                error = PTR_ERR(keypad->clk);
+                goto failed_unmap;
+        }
+        /* Search for rows and cols enabled */
+        for (i = 0; i < keymap_data->keymap_size; i++) {
+                keypad->rows_en_mask |= 1 << KEY_ROW(keymap_data->keymap[i]);
+                keypad->cols_en_mask |= 1 << KEY_COL(keymap_data->keymap[i]);
+        }
+        if (keypad->rows_en_mask > ((1 << MAX_MATRIX_KEY_ROWS) - 1) ||
+           keypad->cols_en_mask > ((1 << MAX_MATRIX_KEY_COLS) - 1)) {
+                dev_err(&pdev->dev,
+                        "invalid key data (too many rows or colums)\n");
+                error = -EINVAL;
+                goto failed_clock_put;
+        }
+        dev_dbg(&pdev->dev, "enabled rows mask: %x\n", keypad->rows_en_mask);
+        dev_dbg(&pdev->dev, "enabled cols mask: %x\n", keypad->cols_en_mask);
+        /* Init the Input device */
+        input_dev->name = pdev->name;
+        input_dev->id.bustype = BUS_HOST;
+        input_dev->dev.parent = &pdev->dev;
+        input_dev->open = imx_keypad_open;
+        input_dev->close = imx_keypad_close;
+        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REP);
+        input_dev->keycode = keypad->keycodes;
+        input_dev->keycodesize = sizeof(keypad->keycodes[0]);
+        input_dev->keycodemax = ARRAY_SIZE(keypad->keycodes);
+        matrix_keypad_build_keymap(keymap_data, MATRIX_ROW_SHIFT,
+                                keypad->keycodes, input_dev->keybit);
+        input_set_capability(input_dev, EV_MSC, MSC_SCAN);
+        input_set_drvdata(input_dev, keypad);
+        /* Ensure that the keypad will stay dormant until opened */
+        imx_keypad_inhibit(keypad);
+        error = request_irq(irq, imx_keypad_irq_handler, IRQF_DISABLED,
+                            pdev->name, keypad);
+        if (error) {
+                dev_err(&pdev->dev, "failed to request IRQ\n");
+                goto failed_clock_put;
+        }
+        /* Register the input device */
+        error = input_register_device(input_dev);
+        if (error) {
+                dev_err(&pdev->dev, "failed to register input device\n");
+                goto failed_free_irq;
+        }
+        platform_set_drvdata(pdev, keypad);
+        device_init_wakeup(&pdev->dev, 1);
+        return 0;
+failed_free_irq:
+        free_irq(irq, pdev);
+failed_clock_put:
+        clk_put(keypad->clk);
+failed_unmap:
+        iounmap(keypad->mmio_base);
+failed_free_priv:
+        kfree(keypad);
+failed_free_input:
+        input_free_device(input_dev);
+failed_rel_mem:
+        release_mem_region(res->start, resource_size(res));
+        return error;
+}
+static int __devexit imx_keypad_remove(struct platform_device *pdev)
+{
+        struct imx_keypad *keypad = platform_get_drvdata(pdev);
+        struct resource *res;
+        dev_dbg(&pdev->dev, ">%s\n", __func__);
+        platform_set_drvdata(pdev, NULL);
+        input_unregister_device(keypad->input_dev);
+        free_irq(keypad->irq, keypad);
+        clk_put(keypad->clk);
+        iounmap(keypad->mmio_base);
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        release_mem_region(res->start, resource_size(res));
+        kfree(keypad);
+        return 0;
+}
+static struct platform_driver imx_keypad_driver = {
+        .driver         = {
+                .name   = "imx-keypad",
+                .owner  = THIS_MODULE,
+        },
+        .probe          = imx_keypad_probe,
+        .remove         = __devexit_p(imx_keypad_remove),
+};
+static int __init imx_keypad_init(void)
+{
+        return platform_driver_register(&imx_keypad_driver);
+}
+static void __exit imx_keypad_exit(void)
+{
+        platform_driver_unregister(&imx_keypad_driver);
+}
+module_init(imx_keypad_init);
+module_exit(imx_keypad_exit);
+MODULE_AUTHOR("Alberto Panizzo <maramaopercheseimorto@gmail.com>");
+MODULE_DESCRIPTION("IMX Keypad Port Driver");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:imx-keypad");
diff --git a/drivers/input/keyboard/qt2160.c b/drivers/input/keyboard/qt2160.c
index 191cc51d6cf..31f30087b59 100644
--- a/drivers/input/keyboard/qt2160.c
+++ b/drivers/input/keyboard/qt2160.c
@@ -362,7 +362,7 @@ static int __devexit qt2160_remove(struct i2c_client *client)
        return 0;
 }
-static struct i2c_device_id qt2160_idtable[] = {
+static const struct i2c_device_id qt2160_idtable[] = {
        { "qt2160", 0, },
        { }
 };
diff --git a/drivers/input/keyboard/sh_keysc.c b/drivers/input/keyboard/sh_keysc.c
index 8e9380bfed4..854e2035cd6 100644
--- a/drivers/input/keyboard/sh_keysc.c
+++ b/drivers/input/keyboard/sh_keysc.c
@@ -19,101 +19,141 @@
 #include <linux/platform_device.h>
 #include <linux/input.h>
 #include <linux/input/sh_keysc.h>
+#include <linux/bitmap.h>
 #include <linux/clk.h>
 #include <linux/io.h>
-#define KYCR1_OFFS   0x00
-#define KYCR2_OFFS   0x04
-#define KYINDR_OFFS  0x08
-#define KYOUTDR_OFFS 0x0c
-#define KYCR2_IRQ_LEVEL    0x10
-#define KYCR2_IRQ_DISABLED 0x00
 static const struct {
        unsigned char kymd, keyout, keyin;
 } sh_keysc_mode[] = {
        [SH_KEYSC_MODE_1] = { 0, 6, 5 },
        [SH_KEYSC_MODE_2] = { 1, 5, 6 },
        [SH_KEYSC_MODE_3] = { 2, 4, 7 },
+        [SH_KEYSC_MODE_4] = { 3, 6, 6 },
+        [SH_KEYSC_MODE_5] = { 4, 6, 7 },
+        [SH_KEYSC_MODE_6] = { 5, 7, 7 },
 };
 struct sh_keysc_priv {
        void __iomem *iomem_base;
        struct clk *clk;
-        unsigned long last_keys;
+        DECLARE_BITMAP(last_keys, SH_KEYSC_MAXKEYS);
        struct input_dev *input;
        struct sh_keysc_info pdata;
 };
+#define KYCR1 0
+#define KYCR2 1
+#define KYINDR 2
+#define KYOUTDR 3
+#define KYCR2_IRQ_LEVEL    0x10
+#define KYCR2_IRQ_DISABLED 0x00
+static unsigned long sh_keysc_read(struct sh_keysc_priv *p, int reg_nr)
+{
+        return ioread16(p->iomem_base + (reg_nr << 2));
+}
+static void sh_keysc_write(struct sh_keysc_priv *p, int reg_nr,
+                           unsigned long value)
+{
+        iowrite16(value, p->iomem_base + (reg_nr << 2));
+}
+static void sh_keysc_level_mode(struct sh_keysc_priv *p,
+                                unsigned long keys_set)
+{
+        struct sh_keysc_info *pdata = &p->pdata;
+        sh_keysc_write(p, KYOUTDR, 0);
+        sh_keysc_write(p, KYCR2, KYCR2_IRQ_LEVEL | (keys_set << 8));
+        if (pdata->kycr2_delay)
+                udelay(pdata->kycr2_delay);
+}
+static void sh_keysc_map_dbg(struct device *dev, unsigned long *map,
+                             const char *str)
+{
+        int k;
+        for (k = 0; k < BITS_TO_LONGS(SH_KEYSC_MAXKEYS); k++)
+                dev_dbg(dev, "%s[%d] 0x%lx\n", str, k, map[k]);
+}
 static irqreturn_t sh_keysc_isr(int irq, void *dev_id)
 {
        struct platform_device *pdev = dev_id;
        struct sh_keysc_priv *priv = platform_get_drvdata(pdev);
        struct sh_keysc_info *pdata = &priv->pdata;
-        unsigned long keys, keys1, keys0, mask;
+        int keyout_nr = sh_keysc_mode[pdata->mode].keyout;
+        int keyin_nr = sh_keysc_mode[pdata->mode].keyin;
+        DECLARE_BITMAP(keys, SH_KEYSC_MAXKEYS);
+        DECLARE_BITMAP(keys0, SH_KEYSC_MAXKEYS);
+        DECLARE_BITMAP(keys1, SH_KEYSC_MAXKEYS);
        unsigned char keyin_set, tmp;
-        int i, k;
+        int i, k, n;
        dev_dbg(&pdev->dev, "isr!\n");
-        keys1 = ~0;
+        bitmap_fill(keys1, SH_KEYSC_MAXKEYS);
-        keys0 = 0;
+        bitmap_zero(keys0, SH_KEYSC_MAXKEYS);
        do {
-                keys = 0;
+                bitmap_zero(keys, SH_KEYSC_MAXKEYS);
                keyin_set = 0;
-                iowrite16(KYCR2_IRQ_DISABLED, priv->iomem_base + KYCR2_OFFS);
+                sh_keysc_write(priv, KYCR2, KYCR2_IRQ_DISABLED);
+                for (i = 0; i < keyout_nr; i++) {
+                        n = keyin_nr * i;
-                for (i = 0; i < sh_keysc_mode[pdata->mode].keyout; i++) {
+                        /* drive one KEYOUT pin low, read KEYIN pins */
-                        iowrite16(0xfff ^ (3 << (i * 2)),
+                        sh_keysc_write(priv, KYOUTDR, 0xffff ^ (3 << (i * 2)));
-                                  priv->iomem_base + KYOUTDR_OFFS);
                        udelay(pdata->delay);
-                        tmp = ioread16(priv->iomem_base + KYINDR_OFFS);
+                        tmp = sh_keysc_read(priv, KYINDR);
-                        keys |= tmp << (sh_keysc_mode[pdata->mode].keyin * i);
-                        tmp ^= (1 << sh_keysc_mode[pdata->mode].keyin) - 1;
-                        keyin_set |= tmp;
-                }
-                iowrite16(0, priv->iomem_base + KYOUTDR_OFFS);
+                        /* set bit if key press has been detected */
-                iowrite16(KYCR2_IRQ_LEVEL | (keyin_set << 8),
+                        for (k = 0; k < keyin_nr; k++) {
-                          priv->iomem_base + KYCR2_OFFS);
+                                if (tmp & (1 << k))
+                                        __set_bit(n + k, keys);
+                        }
-                if (pdata->kycr2_delay)
+                        /* keep track of which KEYIN bits that have been set */
-                        udelay(pdata->kycr2_delay);
+                        keyin_set |= tmp ^ ((1 << keyin_nr) - 1);
+                }
-                keys ^= ~0;
+                sh_keysc_level_mode(priv, keyin_set);
-                keys &= (1 << (sh_keysc_mode[pdata->mode].keyin *
-                               sh_keysc_mode[pdata->mode].keyout)) - 1;
-                keys1 &= keys;
-                keys0 |= keys;
-                dev_dbg(&pdev->dev, "keys 0x%08lx\n", keys);
+                bitmap_complement(keys, keys, SH_KEYSC_MAXKEYS);
+                bitmap_and(keys1, keys1, keys, SH_KEYSC_MAXKEYS);
+                bitmap_or(keys0, keys0, keys, SH_KEYSC_MAXKEYS);
-        } while (ioread16(priv->iomem_base + KYCR2_OFFS) & 0x01);
+                sh_keysc_map_dbg(&pdev->dev, keys, "keys");
-        dev_dbg(&pdev->dev, "last_keys 0x%08lx keys0 0x%08lx keys1 0x%08lx\n",
+        } while (sh_keysc_read(priv, KYCR2) & 0x01);
-                priv->last_keys, keys0, keys1);
+        sh_keysc_map_dbg(&pdev->dev, priv->last_keys, "last_keys");
+        sh_keysc_map_dbg(&pdev->dev, keys0, "keys0");
+        sh_keysc_map_dbg(&pdev->dev, keys1, "keys1");
        for (i = 0; i < SH_KEYSC_MAXKEYS; i++) {
                k = pdata->keycodes[i];
                if (!k)
                        continue;
-                mask = 1 << i;
+                if (test_bit(i, keys0) == test_bit(i, priv->last_keys))
-                if (!((priv->last_keys ^ keys0) & mask))
                        continue;
-                if ((keys1 | keys0) & mask) {
+                if (test_bit(i, keys1) || test_bit(i, keys0)) {
                        input_event(priv->input, EV_KEY, k, 1);
-                        priv->last_keys |= mask;
+                        __set_bit(i, priv->last_keys);
                }
-                if (!(keys1 & mask)) {
+                if (!test_bit(i, keys1)) {
                        input_event(priv->input, EV_KEY, k, 0);
-                        priv->last_keys &= ~mask;
+                        __clear_bit(i, priv->last_keys);
                }
        }
@@ -122,8 +162,6 @@ static irqreturn_t sh_keysc_isr(int irq, void *dev_id)
        return IRQ_HANDLED;
 }
-#define res_size(res) ((res)->end - (res)->start + 1)
 static int __devinit sh_keysc_probe(struct platform_device *pdev)
 {
        struct sh_keysc_priv *priv;
@@ -164,7 +202,7 @@ static int __devinit sh_keysc_probe(struct platform_device *pdev)
        memcpy(&priv->pdata, pdev->dev.platform_data, sizeof(priv->pdata));
        pdata = &priv->pdata;
-        priv->iomem_base = ioremap_nocache(res->start, res_size(res));
+        priv->iomem_base = ioremap_nocache(res->start, resource_size(res));
        if (priv->iomem_base == NULL) {
                dev_err(&pdev->dev, "failed to remap I/O memory\n");
                error = -ENXIO;
@@ -220,10 +258,9 @@ static int __devinit sh_keysc_probe(struct platform_device *pdev)
        clk_enable(priv->clk);
-        iowrite16((sh_keysc_mode[pdata->mode].kymd << 8) |
+        sh_keysc_write(priv, KYCR1, (sh_keysc_mode[pdata->mode].kymd << 8) |
-                  pdata->scan_timing, priv->iomem_base + KYCR1_OFFS);
+                       pdata->scan_timing);
-        iowrite16(0, priv->iomem_base + KYOUTDR_OFFS);
+        sh_keysc_level_mode(priv, 0);
-        iowrite16(KYCR2_IRQ_LEVEL, priv->iomem_base + KYCR2_OFFS);
        device_init_wakeup(&pdev->dev, 1);
@@ -248,7 +285,7 @@ static int __devexit sh_keysc_remove(struct platform_device *pdev)
 {
        struct sh_keysc_priv *priv = platform_get_drvdata(pdev);
-        iowrite16(KYCR2_IRQ_DISABLED, priv->iomem_base + KYCR2_OFFS);
+        sh_keysc_write(priv, KYCR2, KYCR2_IRQ_DISABLED);
        input_unregister_device(priv->input);
        free_irq(platform_get_irq(pdev, 0), pdev);
@@ -270,7 +307,7 @@ static int sh_keysc_suspend(struct device *dev)
        int irq = platform_get_irq(pdev, 0);
        unsigned short value;
-        value = ioread16(priv->iomem_base + KYCR1_OFFS);
+        value = sh_keysc_read(priv, KYCR1);
        if (device_may_wakeup(dev)) {
                value |= 0x80;
@@ -279,7 +316,7 @@ static int sh_keysc_suspend(struct device *dev)
                value &= ~0x80;
        }
-        iowrite16(value, priv->iomem_base + KYCR1_OFFS);
+        sh_keysc_write(priv, KYCR1, value);
        return 0;
 }
diff --git a/drivers/input/misc/apanel.c b/drivers/input/misc/apanel.c
index 71b82434264..a8d2b8db4e3 100644
--- a/drivers/input/misc/apanel.c
+++ b/drivers/input/misc/apanel.c
@@ -149,7 +149,7 @@ static void apanel_shutdown(struct i2c_client *client)
        apanel_remove(client);
 }
-static struct i2c_device_id apanel_id[] = {
+static const struct i2c_device_id apanel_id[] = {
        { "fujitsu_apanel", 0 },
        { }
 };
diff --git a/drivers/input/misc/atlas_btns.c b/drivers/input/misc/atlas_btns.c
index 1b871917340..dfaa9a045ed 100644
--- a/drivers/input/misc/atlas_btns.c
+++ b/drivers/input/misc/atlas_btns.c
@@ -47,7 +47,7 @@ static acpi_status acpi_atlas_button_setup(acpi_handle region_handle,
 static acpi_status acpi_atlas_button_handler(u32 function,
                      acpi_physical_address address,
-                      u32 bit_width, acpi_integer *value,
+                      u32 bit_width, u64 *value,
                      void *handler_context, void *region_context)
 {
        acpi_status status;
diff --git a/drivers/input/misc/rotary_encoder.c b/drivers/input/misc/rotary_encoder.c
index 3b9f588fc74..4ae07935985 100644
--- a/drivers/input/misc/rotary_encoder.c
+++ b/drivers/input/misc/rotary_encoder.c
@@ -152,6 +152,13 @@ static int __devinit rotary_encoder_probe(struct platform_device *pdev)
                goto exit_unregister_input;
        }
+        err = gpio_direction_input(pdata->gpio_a);
+        if (err) {
+                dev_err(&pdev->dev, "unable to set GPIO %d for input\n",
+                        pdata->gpio_a);
+                goto exit_unregister_input;
+        }
        err = gpio_request(pdata->gpio_b, DRV_NAME);
        if (err) {
                dev_err(&pdev->dev, "unable to request GPIO %d\n",
@@ -159,6 +166,13 @@ static int __devinit rotary_encoder_probe(struct platform_device *pdev)
                goto exit_free_gpio_a;
        }
+        err = gpio_direction_input(pdata->gpio_b);
+        if (err) {
+                dev_err(&pdev->dev, "unable to set GPIO %d for input\n",
+                        pdata->gpio_b);
+                goto exit_free_gpio_a;
+        }
        /* request the IRQs */
        err = request_irq(encoder->irq_a, &rotary_encoder_irq,
                          IORESOURCE_IRQ_HIGHEDGE | IORESOURCE_IRQ_LOWEDGE,
diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c
index d3f57245420..1477466076a 100644
--- a/drivers/input/misc/uinput.c
+++ b/drivers/input/misc/uinput.c
@@ -34,7 +34,6 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/init.h>
-#include <linux/smp_lock.h>
 #include <linux/fs.h>
 #include <linux/miscdevice.h>
 #include <linux/uinput.h>
@@ -284,7 +283,6 @@ static int uinput_open(struct inode *inode, struct file *file)
        if (!newdev)
                return -ENOMEM;
-        lock_kernel();
        mutex_init(&newdev->mutex);
        spin_lock_init(&newdev->requests_lock);
        init_waitqueue_head(&newdev->requests_waitq);
@@ -292,7 +290,7 @@ static int uinput_open(struct inode *inode, struct file *file)
        newdev->state = UIST_NEW_DEVICE;
        file->private_data = newdev;
-        unlock_kernel();
+        nonseekable_open(inode, file);
        return 0;
 }
diff --git a/drivers/input/misc/winbond-cir.c b/drivers/input/misc/winbond-cir.c
index c8f5a9a3fa1..cbec3dfdd42 100644
--- a/drivers/input/misc/winbond-cir.c
+++ b/drivers/input/misc/winbond-cir.c
@@ -538,6 +538,7 @@ wbcir_reset_irdata(struct wbcir_data *data)
        data->irdata_count = 0;
        data->irdata_off = 0;
        data->irdata_error = 0;
+        data->idle_count = 0;
 }
 /* Adds one bit of irdata */
@@ -1006,7 +1007,6 @@ wbcir_irq_handler(int irqno, void *cookie)
                }
                wbcir_reset_irdata(data);
-                data->idle_count = 0;
        }
 out:
@@ -1018,7 +1018,7 @@ out:
 /*****************************************************************************
 *
- * SUSPEND/RESUME FUNCTIONS
+ * SETUP/INIT/SUSPEND/RESUME FUNCTIONS
 *
 *****************************************************************************/
@@ -1197,7 +1197,16 @@ finish:
        }
        /* Disable interrupts */
+        wbcir_select_bank(data, WBCIR_BANK_0);
        outb(WBCIR_IRQ_NONE, data->sbase + WBCIR_REG_SP3_IER);
+        /*
+         * ACPI will set the HW disable bit for SP3 which means that the
+         * output signals are left in an undefined state which may cause
+         * spurious interrupts which we need to ignore until the hardware
+         * is reinitialized.
+         */
+        disable_irq(data->irq);
 }
 static int
@@ -1207,37 +1216,15 @@ wbcir_suspend(struct pnp_dev *device, pm_message_t state)
        return 0;
 }
-static int
-wbcir_resume(struct pnp_dev *device)
-{
-        struct wbcir_data *data = pnp_get_drvdata(device);
-        /* Clear BUFF_EN, Clear END_EN, Clear MATCH_EN */
-        wbcir_set_bits(data->wbase + WBCIR_REG_WCEIR_EV_EN, 0x00, 0x07);
-        /* Clear CEIR_EN */
-        wbcir_set_bits(data->wbase + WBCIR_REG_WCEIR_CTL, 0x00, 0x01);
-        /* Enable interrupts */
-        wbcir_reset_irdata(data);
-        outb(WBCIR_IRQ_RX | WBCIR_IRQ_ERR, data->sbase + WBCIR_REG_SP3_IER);
-        return 0;
-}
-/*****************************************************************************
- *
- * SETUP/INIT FUNCTIONS
- *
- *****************************************************************************/
 static void
-wbcir_cfg_ceir(struct wbcir_data *data)
+wbcir_init_hw(struct wbcir_data *data)
 {
        u8 tmp;
+        /* Disable interrupts */
+        wbcir_select_bank(data, WBCIR_BANK_0);
+        outb(WBCIR_IRQ_NONE, data->sbase + WBCIR_REG_SP3_IER);
        /* Set PROT_SEL, RX_INV, Clear CEIR_EN (needed for the led) */
        tmp = protocol << 4;
        if (invert)
@@ -1264,6 +1251,93 @@ wbcir_cfg_ceir(struct wbcir_data *data)
         * set SP3_IRRX_SW to binary 01, helpfully not documented
         */
        outb(0x10, data->ebase + WBCIR_REG_ECEIR_CTS);
+        /* Enable extended mode */
+        wbcir_select_bank(data, WBCIR_BANK_2);
+        outb(WBCIR_EXT_ENABLE, data->sbase + WBCIR_REG_SP3_EXCR1);
+        /*
+         * Configure baud generator, IR data will be sampled at
+         * a bitrate of: (24Mhz * prescaler) / (divisor * 16).
+         *
+         * The ECIR registers include a flag to change the
+         * 24Mhz clock freq to 48Mhz.
+         *
+         * It's not documented in the specs, but fifo levels
+         * other than 16 seems to be unsupported.
+         */
+        /* prescaler 1.0, tx/rx fifo lvl 16 */
+        outb(0x30, data->sbase + WBCIR_REG_SP3_EXCR2);
+        /* Set baud divisor to generate one byte per bit/cell */
+        switch (protocol) {
+        case IR_PROTOCOL_RC5:
+                outb(0xA7, data->sbase + WBCIR_REG_SP3_BGDL);
+                break;
+        case IR_PROTOCOL_RC6:
+                outb(0x53, data->sbase + WBCIR_REG_SP3_BGDL);
+                break;
+        case IR_PROTOCOL_NEC:
+                outb(0x69, data->sbase + WBCIR_REG_SP3_BGDL);
+                break;
+        }
+        outb(0x00, data->sbase + WBCIR_REG_SP3_BGDH);
+        /* Set CEIR mode */
+        wbcir_select_bank(data, WBCIR_BANK_0);
+        outb(0xC0, data->sbase + WBCIR_REG_SP3_MCR);
+        inb(data->sbase + WBCIR_REG_SP3_LSR); /* Clear LSR */
+        inb(data->sbase + WBCIR_REG_SP3_MSR); /* Clear MSR */
+        /* Disable RX demod, run-length encoding/decoding, set freq span */
+        wbcir_select_bank(data, WBCIR_BANK_7);
+        outb(0x10, data->sbase + WBCIR_REG_SP3_RCCFG);
+        /* Disable timer */
+        wbcir_select_bank(data, WBCIR_BANK_4);
+        outb(0x00, data->sbase + WBCIR_REG_SP3_IRCR1);
+        /* Enable MSR interrupt, Clear AUX_IRX */
+        wbcir_select_bank(data, WBCIR_BANK_5);
+        outb(0x00, data->sbase + WBCIR_REG_SP3_IRCR2);
+        /* Disable CRC */
+        wbcir_select_bank(data, WBCIR_BANK_6);
+        outb(0x20, data->sbase + WBCIR_REG_SP3_IRCR3);
+        /* Set RX/TX (de)modulation freq, not really used */
+        wbcir_select_bank(data, WBCIR_BANK_7);
+        outb(0xF2, data->sbase + WBCIR_REG_SP3_IRRXDC);
+        outb(0x69, data->sbase + WBCIR_REG_SP3_IRTXMC);
+        /* Set invert and pin direction */
+        if (invert)
+                outb(0x10, data->sbase + WBCIR_REG_SP3_IRCFG4);
+        else
+                outb(0x00, data->sbase + WBCIR_REG_SP3_IRCFG4);
+        /* Set FIFO thresholds (RX = 8, TX = 3), reset RX/TX */
+        wbcir_select_bank(data, WBCIR_BANK_0);
+        outb(0x97, data->sbase + WBCIR_REG_SP3_FCR);
+        /* Clear AUX status bits */
+        outb(0xE0, data->sbase + WBCIR_REG_SP3_ASCR);
+        /* Enable interrupts */
+        wbcir_reset_irdata(data);
+        outb(WBCIR_IRQ_RX | WBCIR_IRQ_ERR, data->sbase + WBCIR_REG_SP3_IER);
+}
+static int
+wbcir_resume(struct pnp_dev *device)
+{
+        struct wbcir_data *data = pnp_get_drvdata(device);
+        wbcir_init_hw(data);
+        enable_irq(data->irq);
+        return 0;
 }
 static int __devinit
@@ -1393,86 +1467,7 @@ wbcir_probe(struct pnp_dev *device, const struct pnp_device_id *dev_id)
        device_init_wakeup(&device->dev, 1);
-        wbcir_cfg_ceir(data);
+        wbcir_init_hw(data);
-        /* Disable interrupts */
-        wbcir_select_bank(data, WBCIR_BANK_0);
-        outb(WBCIR_IRQ_NONE, data->sbase + WBCIR_REG_SP3_IER);
-        /* Enable extended mode */
-        wbcir_select_bank(data, WBCIR_BANK_2);
-        outb(WBCIR_EXT_ENABLE, data->sbase + WBCIR_REG_SP3_EXCR1);
-        /*
-         * Configure baud generator, IR data will be sampled at
-         * a bitrate of: (24Mhz * prescaler) / (divisor * 16).
-         *
-         * The ECIR registers include a flag to change the
-         * 24Mhz clock freq to 48Mhz.
-         *
-         * It's not documented in the specs, but fifo levels
-         * other than 16 seems to be unsupported.
-         */
-        /* prescaler 1.0, tx/rx fifo lvl 16 */
-        outb(0x30, data->sbase + WBCIR_REG_SP3_EXCR2);
-        /* Set baud divisor to generate one byte per bit/cell */
-        switch (protocol) {
-        case IR_PROTOCOL_RC5:
-                outb(0xA7, data->sbase + WBCIR_REG_SP3_BGDL);
-                break;
-        case IR_PROTOCOL_RC6:
-                outb(0x53, data->sbase + WBCIR_REG_SP3_BGDL);
-                break;
-        case IR_PROTOCOL_NEC:
-                outb(0x69, data->sbase + WBCIR_REG_SP3_BGDL);
-                break;
-        }
-        outb(0x00, data->sbase + WBCIR_REG_SP3_BGDH);
-        /* Set CEIR mode */
-        wbcir_select_bank(data, WBCIR_BANK_0);
-        outb(0xC0, data->sbase + WBCIR_REG_SP3_MCR);
-        inb(data->sbase + WBCIR_REG_SP3_LSR); /* Clear LSR */
-        inb(data->sbase + WBCIR_REG_SP3_MSR); /* Clear MSR */
-        /* Disable RX demod, run-length encoding/decoding, set freq span */
-        wbcir_select_bank(data, WBCIR_BANK_7);
-        outb(0x10, data->sbase + WBCIR_REG_SP3_RCCFG);
-        /* Disable timer */
-        wbcir_select_bank(data, WBCIR_BANK_4);
-        outb(0x00, data->sbase + WBCIR_REG_SP3_IRCR1);
-        /* Enable MSR interrupt, Clear AUX_IRX */
-        wbcir_select_bank(data, WBCIR_BANK_5);
-        outb(0x00, data->sbase + WBCIR_REG_SP3_IRCR2);
-        /* Disable CRC */
-        wbcir_select_bank(data, WBCIR_BANK_6);
-        outb(0x20, data->sbase + WBCIR_REG_SP3_IRCR3);
-        /* Set RX/TX (de)modulation freq, not really used */
-        wbcir_select_bank(data, WBCIR_BANK_7);
-        outb(0xF2, data->sbase + WBCIR_REG_SP3_IRRXDC);
-        outb(0x69, data->sbase + WBCIR_REG_SP3_IRTXMC);
-        /* Set invert and pin direction */
-        if (invert)
-                outb(0x10, data->sbase + WBCIR_REG_SP3_IRCFG4);
-        else
-                outb(0x00, data->sbase + WBCIR_REG_SP3_IRCFG4);
-        /* Set FIFO thresholds (RX = 8, TX = 3), reset RX/TX */
-        wbcir_select_bank(data, WBCIR_BANK_0);
-        outb(0x97, data->sbase + WBCIR_REG_SP3_FCR);
-        /* Clear AUX status bits */
-        outb(0xE0, data->sbase + WBCIR_REG_SP3_ASCR);
-        /* Enable interrupts */
-        outb(WBCIR_IRQ_RX | WBCIR_IRQ_ERR, data->sbase + WBCIR_REG_SP3_IER);
        return 0;
diff --git a/drivers/input/mouse/hgpk.c b/drivers/input/mouse/hgpk.c
index 90be30e9355..9169d1591c1 100644
--- a/drivers/input/mouse/hgpk.c
+++ b/drivers/input/mouse/hgpk.c
@@ -68,10 +68,6 @@ module_param(post_interrupt_delay, int, 0644);
 MODULE_PARM_DESC(post_interrupt_delay,
        "delay (ms) before recal after recal interrupt detected");
-static int autorecal = 1;
-module_param(autorecal, int, 0644);
-MODULE_PARM_DESC(autorecal, "enable recalibration in the driver");
 /*
 * When the touchpad gets ultra-sensitive, one can keep their finger 1/2"
 * above the pad and still have it send packets.  This causes a jump cursor
diff --git a/drivers/input/serio/pcips2.c b/drivers/input/serio/pcips2.c
index 1dacbe0d934..797314be7af 100644
--- a/drivers/input/serio/pcips2.c
+++ b/drivers/input/serio/pcips2.c
@@ -186,7 +186,7 @@ static void __devexit pcips2_remove(struct pci_dev *dev)
        pci_disable_device(dev);
 }
-static struct pci_device_id pcips2_ids[] = {
+static const struct pci_device_id pcips2_ids[] = {
        {
                .vendor         = 0x14f2,       /* MOBILITY */
                .device         = 0x0123,       /* Keyboard */
diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
index e0f30186d51..c3b626e9eae 100644
--- a/drivers/input/serio/serio.c
+++ b/drivers/input/serio/serio.c
@@ -26,6 +26,8 @@
 * Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic
 */
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 #include <linux/stddef.h>
 #include <linux/module.h>
 #include <linux/serio.h>
@@ -119,11 +121,10 @@ static int serio_bind_driver(struct serio *serio, struct serio_driver *drv)
                error = device_bind_driver(&serio->dev);
                if (error) {
-                        printk(KERN_WARNING
+                        dev_warn(&serio->dev,
-                                "serio: device_bind_driver() failed "
+                                 "device_bind_driver() failed for %s (%s) and %s, error: %d\n",
-                                "for %s (%s) and %s, error: %d\n",
+                                 serio->phys, serio->name,
-                                serio->phys, serio->name,
+                                 drv->description, error);
-                                drv->description, error);
                        serio_disconnect_driver(serio);
                        serio->dev.driver = NULL;
                        return error;
@@ -138,9 +139,9 @@ static void serio_find_driver(struct serio *serio)
        error = device_attach(&serio->dev);
        if (error < 0)
-                printk(KERN_WARNING
+                dev_warn(&serio->dev,
-                        "serio: device_attach() failed for %s (%s), error: %d\n",
+                         "device_attach() failed for %s (%s), error: %d\n",
-                        serio->phys, serio->name, error);
+                         serio->phys, serio->name, error);
 }
@@ -194,17 +195,14 @@ static int serio_queue_event(void *object, struct module *owner,
        event = kmalloc(sizeof(struct serio_event), GFP_ATOMIC);
        if (!event) {
-                printk(KERN_ERR
+                pr_err("Not enough memory to queue event %d\n", event_type);
-                        "serio: Not enough memory to queue event %d\n",
-                        event_type);
                retval = -ENOMEM;
                goto out;
        }
        if (!try_module_get(owner)) {
-                printk(KERN_WARNING
+                pr_warning("Can't get module reference, dropping event %d\n",
-                        "serio: Can't get module reference, dropping event %d\n",
+                           event_type);
-                        event_type);
                kfree(event);
                retval = -EINVAL;
                goto out;
@@ -230,14 +228,12 @@ static void serio_free_event(struct serio_event *event)
 static void serio_remove_duplicate_events(struct serio_event *event)
 {
-        struct list_head *node, *next;
+        struct serio_event *e, *next;
-        struct serio_event *e;
        unsigned long flags;
        spin_lock_irqsave(&serio_event_lock, flags);
-        list_for_each_safe(node, next, &serio_event_list) {
+        list_for_each_entry_safe(e, next, &serio_event_list, node) {
-                e = list_entry(node, struct serio_event, node);
                if (event->object == e->object) {
                        /*
                         * If this event is of different type we should not
@@ -247,7 +243,7 @@ static void serio_remove_duplicate_events(struct serio_event *event)
                        if (event->type != e->type)
                                break;
-                        list_del_init(node);
+                        list_del_init(&e->node);
                        serio_free_event(e);
                }
        }
@@ -258,23 +254,18 @@ static void serio_remove_duplicate_events(struct serio_event *event)
 static struct serio_event *serio_get_event(void)
 {
-        struct serio_event *event;
+        struct serio_event *event = NULL;
-        struct list_head *node;
        unsigned long flags;
        spin_lock_irqsave(&serio_event_lock, flags);
-        if (list_empty(&serio_event_list)) {
+        if (!list_empty(&serio_event_list)) {
-                spin_unlock_irqrestore(&serio_event_lock, flags);
+                event = list_first_entry(&serio_event_list,
-                return NULL;
+                                         struct serio_event, node);
+                list_del_init(&event->node);
        }
-        node = serio_event_list.next;
-        event = list_entry(node, struct serio_event, node);
-        list_del_init(node);
        spin_unlock_irqrestore(&serio_event_lock, flags);
        return event;
 }
@@ -287,29 +278,27 @@ static void serio_handle_event(void)
        while ((event = serio_get_event())) {
                switch (event->type) {
-                        case SERIO_REGISTER_PORT:
-                                serio_add_port(event->object);
-                                break;
-                        case SERIO_RECONNECT_PORT:
+                case SERIO_REGISTER_PORT:
-                                serio_reconnect_port(event->object);
+                        serio_add_port(event->object);
-                                break;
+                        break;
-                        case SERIO_RESCAN_PORT:
+                case SERIO_RECONNECT_PORT:
-                                serio_disconnect_port(event->object);
+                        serio_reconnect_port(event->object);
-                                serio_find_driver(event->object);
+                        break;
-                                break;
-                        case SERIO_RECONNECT_CHAIN:
+                case SERIO_RESCAN_PORT:
-                                serio_reconnect_chain(event->object);
+                        serio_disconnect_port(event->object);
-                                break;
+                        serio_find_driver(event->object);
+                        break;
-                        case SERIO_ATTACH_DRIVER:
+                case SERIO_RECONNECT_CHAIN:
-                                serio_attach_driver(event->object);
+                        serio_reconnect_chain(event->object);
-                                break;
+                        break;
-                        default:
+                case SERIO_ATTACH_DRIVER:
-                                break;
+                        serio_attach_driver(event->object);
+                        break;
                }
                serio_remove_duplicate_events(event);
@@ -325,16 +314,14 @@ static void serio_handle_event(void)
 */
 static void serio_remove_pending_events(void *object)
 {
-        struct list_head *node, *next;
+        struct serio_event *event, *next;
-        struct serio_event *event;
        unsigned long flags;
        spin_lock_irqsave(&serio_event_lock, flags);
-        list_for_each_safe(node, next, &serio_event_list) {
+        list_for_each_entry_safe(event, next, &serio_event_list, node) {
-                event = list_entry(node, struct serio_event, node);
                if (event->object == object) {
-                        list_del_init(node);
+                        list_del_init(&event->node);
                        serio_free_event(event);
                }
        }
@@ -380,7 +367,6 @@ static int serio_thread(void *nothing)
                        kthread_should_stop() || !list_empty(&serio_event_list));
        } while (!kthread_should_stop());
-        printk(KERN_DEBUG "serio: kseriod exiting\n");
        return 0;
 }
@@ -445,6 +431,11 @@ static struct attribute_group serio_id_attr_group = {
        .attrs  = serio_device_id_attrs,
 };
+static const struct attribute_group *serio_device_attr_groups[] = {
+        &serio_id_attr_group,
+        NULL
+};
 static ssize_t serio_rebind_driver(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
        struct serio *serio = to_serio_port(dev);
@@ -532,6 +523,7 @@ static void serio_init_port(struct serio *serio)
                        (long)atomic_inc_return(&serio_no) - 1);
        serio->dev.bus = &serio_bus;
        serio->dev.release = serio_release_port;
+        serio->dev.groups = serio_device_attr_groups;
        if (serio->parent) {
                serio->dev.parent = &serio->parent->dev;
                serio->depth = serio->parent->depth + 1;
@@ -555,21 +547,15 @@ static void serio_add_port(struct serio *serio)
        }
        list_add_tail(&serio->node, &serio_list);
        if (serio->start)
                serio->start(serio);
        error = device_add(&serio->dev);
        if (error)
-                printk(KERN_ERR
+                dev_err(&serio->dev,
-                        "serio: device_add() failed for %s (%s), error: %d\n",
+                        "device_add() failed for %s (%s), error: %d\n",
                        serio->phys, serio->name, error);
-        else {
-                serio->registered = true;
-                error = sysfs_create_group(&serio->dev.kobj, &serio_id_attr_group);
-                if (error)
-                        printk(KERN_ERR
-                                "serio: sysfs_create_group() failed for %s (%s), error: %d\n",
-                                serio->phys, serio->name, error);
-        }
 }
 /*
@@ -596,11 +582,8 @@ static void serio_destroy_port(struct serio *serio)
                serio->parent = NULL;
        }
-        if (serio->registered) {
+        if (device_is_registered(&serio->dev))
-                sysfs_remove_group(&serio->dev.kobj, &serio_id_attr_group);
                device_del(&serio->dev);
-                serio->registered = false;
-        }
        list_del_init(&serio->node);
        serio_remove_pending_events(serio);
@@ -798,9 +781,8 @@ static void serio_attach_driver(struct serio_driver *drv)
        error = driver_attach(&drv->driver);
        if (error)
-                printk(KERN_WARNING
+                pr_warning("driver_attach() failed for %s with error %d\n",
-                        "serio: driver_attach() failed for %s with error %d\n",
+                           drv->driver.name, error);
-                        drv->driver.name, error);
 }
 int __serio_register_driver(struct serio_driver *drv, struct module *owner, const char *mod_name)
@@ -820,8 +802,7 @@ int __serio_register_driver(struct serio_driver *drv, struct module *owner, cons
        error = driver_register(&drv->driver);
        if (error) {
-                printk(KERN_ERR
+                pr_err("driver_register() failed for %s, error: %d\n",
-                        "serio: driver_register() failed for %s, error: %d\n",
                        drv->driver.name, error);
                return error;
        }
@@ -987,7 +968,7 @@ irqreturn_t serio_interrupt(struct serio *serio,
        if (likely(serio->drv)) {
                ret = serio->drv->interrupt(serio, data, dfl);
-        } else if (!dfl && serio->registered) {
+        } else if (!dfl && device_is_registered(&serio->dev)) {
                serio_rescan(serio);
                ret = IRQ_HANDLED;
        }
@@ -1018,7 +999,7 @@ static int __init serio_init(void)
        error = bus_register(&serio_bus);
        if (error) {
-                printk(KERN_ERR "serio: failed to register serio bus, error: %d\n", error);
+                pr_err("Failed to register serio bus, error: %d\n", error);
                return error;
        }
@@ -1026,7 +1007,7 @@ static int __init serio_init(void)
        if (IS_ERR(serio_task)) {
                bus_unregister(&serio_bus);
                error = PTR_ERR(serio_task);
-                printk(KERN_ERR "serio: Failed to start kseriod, error: %d\n", error);
+                pr_err("Failed to start kseriod, error: %d\n", error);
                return error;
        }
diff --git a/drivers/input/serio/xilinx_ps2.c b/drivers/input/serio/xilinx_ps2.c
index ebb22f88c84..8298e1f6823 100644
--- a/drivers/input/serio/xilinx_ps2.c
+++ b/drivers/input/serio/xilinx_ps2.c
@@ -270,7 +270,7 @@ static int __devinit xps2_of_probe(struct of_device *ofdev,
        drvdata->irq = r_irq.start;
        phys_addr = r_mem.start;
-        remap_size = r_mem.end - r_mem.start + 1;
+        remap_size = resource_size(&r_mem);
        if (!request_mem_region(phys_addr, remap_size, DRIVER_NAME)) {
                dev_err(dev, "Couldn't lock memory region at 0x%08llX\n",
                        (unsigned long long)phys_addr);
@@ -344,7 +344,7 @@ static int __devexit xps2_of_remove(struct of_device *of_dev)
        if (of_address_to_resource(of_dev->node, 0, &r_mem))
                dev_err(dev, "invalid address\n");
        else
-                release_mem_region(r_mem.start, r_mem.end - r_mem.start + 1);
+                release_mem_region(r_mem.start, resource_size(&r_mem));
        kfree(drvdata);
@@ -354,7 +354,7 @@ static int __devexit xps2_of_remove(struct of_device *of_dev)
 }
 /* Match table for of_platform binding */
-static struct of_device_id xps2_of_match[] __devinitdata = {
+static const struct of_device_id xps2_of_match[] __devinitconst = {
        { .compatible = "xlnx,xps-ps2-1.00.a", },
        { /* end of list */ },
 };
diff --git a/drivers/input/tablet/gtco.c b/drivers/input/tablet/gtco.c
index 3d32d3f4e48..866a9ee1af1 100644
--- a/drivers/input/tablet/gtco.c
+++ b/drivers/input/tablet/gtco.c
@@ -92,7 +92,7 @@ Scott Hill shill@gtcocalcomp.com
 /* DATA STRUCTURES */
 /* Device table */
-static struct usb_device_id gtco_usbid_table [] = {
+static const struct usb_device_id gtco_usbid_table[] = {
        { USB_DEVICE(VENDOR_ID_GTCO, PID_400) },
        { USB_DEVICE(VENDOR_ID_GTCO, PID_401) },
        { USB_DEVICE(VENDOR_ID_GTCO, PID_1000) },
diff --git a/drivers/input/tablet/wacom.h b/drivers/input/tablet/wacom.h
index 16310f368da..8fef1b689c6 100644
--- a/drivers/input/tablet/wacom.h
+++ b/drivers/input/tablet/wacom.h
@@ -85,6 +85,7 @@
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/module.h>
+#include <linux/mod_devicetable.h>
 #include <linux/init.h>
 #include <linux/usb/input.h>
 #include <asm/unaligned.h>
@@ -120,6 +121,8 @@ struct wacom_combo {
        struct urb *urb;
 };
+extern const struct usb_device_id wacom_ids[];
 extern int wacom_wac_irq(struct wacom_wac * wacom_wac, void * wcombo);
 extern void wacom_report_abs(void *wcombo, unsigned int abs_type, int abs_data);
 extern void wacom_report_rel(void *wcombo, unsigned int rel_type, int rel_data);
@@ -142,7 +145,5 @@ extern void input_dev_mo(struct input_dev *input_dev, struct wacom_wac *wacom_wa
 extern void input_dev_bee(struct input_dev *input_dev, struct wacom_wac *wacom_wac);
 extern __u16 wacom_le16_to_cpu(unsigned char *data);
 extern __u16 wacom_be16_to_cpu(unsigned char *data);
-extern struct wacom_features *get_wacom_feature(const struct usb_device_id *id);
-extern const struct usb_device_id *get_device_table(void);
 #endif
diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c
index 072f33b3b2b..a1770e6feee 100644
--- a/drivers/input/tablet/wacom_sys.c
+++ b/drivers/input/tablet/wacom_sys.c
@@ -211,7 +211,8 @@ void input_dev_g(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
        input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_RUBBER) |
                BIT_MASK(BTN_TOOL_PEN) | BIT_MASK(BTN_STYLUS) |
                BIT_MASK(BTN_TOOL_MOUSE) | BIT_MASK(BTN_STYLUS2);
-        input_set_abs_params(input_dev, ABS_DISTANCE, 0, wacom_wac->features->distance_max, 0, 0);
+        input_set_abs_params(input_dev, ABS_DISTANCE,
+                             0, wacom_wac->features.distance_max, 0, 0);
 }
 void input_dev_i3s(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
@@ -261,7 +262,8 @@ void input_dev_i(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
                BIT_MASK(BTN_TOOL_MOUSE) | BIT_MASK(BTN_TOOL_BRUSH) |
                BIT_MASK(BTN_TOOL_PENCIL) | BIT_MASK(BTN_TOOL_AIRBRUSH) |
                BIT_MASK(BTN_TOOL_LENS) | BIT_MASK(BTN_STYLUS2);
-        input_set_abs_params(input_dev, ABS_DISTANCE, 0, wacom_wac->features->distance_max, 0, 0);
+        input_set_abs_params(input_dev, ABS_DISTANCE,
+                             0, wacom_wac->features.distance_max, 0, 0);
        input_set_abs_params(input_dev, ABS_WHEEL, 0, 1023, 0, 0);
        input_set_abs_params(input_dev, ABS_TILT_X, 0, 127, 0, 0);
        input_set_abs_params(input_dev, ABS_TILT_Y, 0, 127, 0, 0);
@@ -282,17 +284,19 @@ void input_dev_pt(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
 void input_dev_tpc(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
 {
-        if (wacom_wac->features->device_type == BTN_TOOL_DOUBLETAP ||
+        struct wacom_features *features = &wacom_wac->features;
-            wacom_wac->features->device_type == BTN_TOOL_TRIPLETAP) {
-                input_set_abs_params(input_dev, ABS_RX, 0, wacom_wac->features->x_phy, 0, 0);
+        if (features->device_type == BTN_TOOL_DOUBLETAP ||
-                input_set_abs_params(input_dev, ABS_RY, 0, wacom_wac->features->y_phy, 0, 0);
+            features->device_type == BTN_TOOL_TRIPLETAP) {
-                input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_DOUBLETAP);
+                input_set_abs_params(input_dev, ABS_RX, 0, features->x_phy, 0, 0);
+                input_set_abs_params(input_dev, ABS_RY, 0, features->y_phy, 0, 0);
+                __set_bit(BTN_TOOL_DOUBLETAP, input_dev->keybit);
        }
 }
 void input_dev_tpc2fg(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
 {
-        if (wacom_wac->features->device_type == BTN_TOOL_TRIPLETAP) {
+        if (wacom_wac->features.device_type == BTN_TOOL_TRIPLETAP) {
                input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_TRIPLETAP);
                input_dev->evbit[0] |= BIT_MASK(EV_MSC);
                input_dev->mscbit[0] |= BIT_MASK(MSC_SERIAL);
@@ -532,21 +536,38 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i
        struct wacom_wac *wacom_wac;
        struct wacom_features *features;
        struct input_dev *input_dev;
-        int error = -ENOMEM;
+        int error;
+        if (!id->driver_info)
+                return -EINVAL;
        wacom = kzalloc(sizeof(struct wacom), GFP_KERNEL);
        wacom_wac = kzalloc(sizeof(struct wacom_wac), GFP_KERNEL);
        input_dev = input_allocate_device();
-        if (!wacom || !input_dev || !wacom_wac)
+        if (!wacom || !input_dev || !wacom_wac) {
+                error = -ENOMEM;
                goto fail1;
+        }
-        wacom_wac->data = usb_buffer_alloc(dev, WACOM_PKGLEN_MAX, GFP_KERNEL, &wacom->data_dma);
+        wacom_wac->features = *((struct wacom_features *)id->driver_info);
-        if (!wacom_wac->data)
+        features = &wacom_wac->features;
+        if (features->pktlen > WACOM_PKGLEN_MAX) {
+                error = -EINVAL;
                goto fail1;
+        }
+        wacom_wac->data = usb_buffer_alloc(dev, WACOM_PKGLEN_MAX,
+                                           GFP_KERNEL, &wacom->data_dma);
+        if (!wacom_wac->data) {
+                error = -ENOMEM;
+                goto fail1;
+        }
        wacom->irq = usb_alloc_urb(0, GFP_KERNEL);
-        if (!wacom->irq)
+        if (!wacom->irq) {
+                error = -ENOMEM;
                goto fail2;
+        }
        wacom->usbdev = dev;
        wacom->dev = input_dev;
@@ -555,11 +576,6 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i
        usb_make_path(dev, wacom->phys, sizeof(wacom->phys));
        strlcat(wacom->phys, "/input0", sizeof(wacom->phys));
-        wacom_wac->features = features = get_wacom_feature(id);
-        BUG_ON(features->pktlen > WACOM_PKGLEN_MAX);
-        input_dev->name = wacom_wac->features->name;
-        wacom->wacom_wac = wacom_wac;
        usb_to_input_id(dev, &input_dev->id);
        input_dev->dev.parent = &intf->dev;
@@ -576,6 +592,19 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i
        if (error)
                goto fail2;
+        strlcpy(wacom_wac->name, features->name, sizeof(wacom_wac->name));
+        if (features->type == TABLETPC || features->type == TABLETPC2FG) {
+                /* Append the device type to the name */
+                strlcat(wacom_wac->name,
+                        features->device_type == BTN_TOOL_PEN ?
+                                " Pen" : " Finger",
+                        sizeof(wacom_wac->name));
+        }
+        input_dev->name = wacom_wac->name;
+        wacom->wacom_wac = wacom_wac;
        input_dev->evbit[0] |= BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
        input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOUCH);
@@ -640,7 +669,7 @@ static int wacom_suspend(struct usb_interface *intf, pm_message_t message)
 static int wacom_resume(struct usb_interface *intf)
 {
        struct wacom *wacom = usb_get_intfdata(intf);
-        struct wacom_features *features = wacom->wacom_wac->features;
+        struct wacom_features *features = &wacom->wacom_wac->features;
        int rv;
        mutex_lock(&wacom->lock);
@@ -663,6 +692,7 @@ static int wacom_reset_resume(struct usb_interface *intf)
 static struct usb_driver wacom_driver = {
        .name =         "wacom",
+        .id_table =     wacom_ids,
        .probe =        wacom_probe,
        .disconnect =   wacom_disconnect,
        .suspend =      wacom_suspend,
@@ -674,7 +704,7 @@ static struct usb_driver wacom_driver = {
 static int __init wacom_init(void)
 {
        int result;
-        wacom_driver.id_table = get_device_table();
        result = usb_register(&wacom_driver);
        if (result == 0)
                printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
index 1056f149fe3..3d81443e683 100644
--- a/drivers/input/tablet/wacom_wac.c
+++ b/drivers/input/tablet/wacom_wac.c
@@ -55,6 +55,7 @@ static int wacom_penpartner_irq(struct wacom_wac *wacom, void *wcombo)
 static int wacom_pl_irq(struct wacom_wac *wacom, void *wcombo)
 {
+        struct wacom_features *features = &wacom->features;
        unsigned char *data = wacom->data;
        int prox, pressure;
@@ -68,9 +69,9 @@ static int wacom_pl_irq(struct wacom_wac *wacom, void *wcombo)
        if (prox) {
                wacom->id[0] = ERASER_DEVICE_ID;
                pressure = (signed char)((data[7] << 1) | ((data[4] >> 2) & 1));
-                if (wacom->features->pressure_max > 255)
+                if (features->pressure_max > 255)
                        pressure = (pressure << 1) | ((data[4] >> 6) & 1);
-                pressure += (wacom->features->pressure_max + 1) / 2;
+                pressure += (features->pressure_max + 1) / 2;
                /*
                 * if going from out of proximity into proximity select between the eraser
@@ -152,6 +153,7 @@ static int wacom_ptu_irq(struct wacom_wac *wacom, void *wcombo)
 static int wacom_graphire_irq(struct wacom_wac *wacom, void *wcombo)
 {
+        struct wacom_features *features = &wacom->features;
        unsigned char *data = wacom->data;
        int x, y, rw;
        static int penData = 0;
@@ -179,8 +181,7 @@ static int wacom_graphire_irq(struct wacom_wac *wacom, void *wcombo)
                        case 2: /* Mouse with wheel */
                                wacom_report_key(wcombo, BTN_MIDDLE, data[1] & 0x04);
-                                if (wacom->features->type == WACOM_G4 ||
+                                if (features->type == WACOM_G4 || features->type == WACOM_MO) {
-                                                wacom->features->type == WACOM_MO) {
                                        rw = data[7] & 0x04 ? (data[7] & 0x03)-4 : (data[7] & 0x03);
                                        wacom_report_rel(wcombo, REL_WHEEL, -rw);
                                } else
@@ -192,8 +193,7 @@ static int wacom_graphire_irq(struct wacom_wac *wacom, void *wcombo)
                                wacom->id[0] = CURSOR_DEVICE_ID;
                                wacom_report_key(wcombo, BTN_LEFT, data[1] & 0x01);
                                wacom_report_key(wcombo, BTN_RIGHT, data[1] & 0x02);
-                                if (wacom->features->type == WACOM_G4 ||
+                                if (features->type == WACOM_G4 || features->type == WACOM_MO)
-                                                wacom->features->type == WACOM_MO)
                                        wacom_report_abs(wcombo, ABS_DISTANCE, data[6] & 0x3f);
                                else
                                        wacom_report_abs(wcombo, ABS_DISTANCE, data[7] & 0x3f);
@@ -230,7 +230,7 @@ static int wacom_graphire_irq(struct wacom_wac *wacom, void *wcombo)
        }
        /* send pad data */
-        switch (wacom->features->type) {
+        switch (features->type) {
            case WACOM_G4:
                if (data[7] & 0xf8) {
                        if (penData) {
@@ -300,11 +300,12 @@ static int wacom_graphire_irq(struct wacom_wac *wacom, void *wcombo)
 static int wacom_intuos_inout(struct wacom_wac *wacom, void *wcombo)
 {
+        struct wacom_features *features = &wacom->features;
        unsigned char *data = wacom->data;
        int idx = 0;
        /* tool number */
-        if (wacom->features->type == INTUOS)
+        if (features->type == INTUOS)
                idx = data[1] & 0x01;
        /* Enter report */
@@ -402,7 +403,7 @@ static int wacom_intuos_inout(struct wacom_wac *wacom, void *wcombo)
                        wacom_report_key(wcombo, BTN_STYLUS2, 0);
                        wacom_report_key(wcombo, BTN_TOUCH, 0);
                        wacom_report_abs(wcombo, ABS_WHEEL, 0);
-                        if (wacom->features->type >= INTUOS3S)
+                        if (features->type >= INTUOS3S)
                                wacom_report_abs(wcombo, ABS_Z, 0);
                }
                wacom_report_key(wcombo, wacom->tool[idx], 0);
@@ -416,13 +417,14 @@ static int wacom_intuos_inout(struct wacom_wac *wacom, void *wcombo)
 static void wacom_intuos_general(struct wacom_wac *wacom, void *wcombo)
 {
+        struct wacom_features *features = &wacom->features;
        unsigned char *data = wacom->data;
        unsigned int t;
        /* general pen packet */
        if ((data[1] & 0xb8) == 0xa0) {
                t = (data[6] << 2) | ((data[7] >> 6) & 3);
-                if (wacom->features->type >= INTUOS4S && wacom->features->type <= INTUOS4L)
+                if (features->type >= INTUOS4S && features->type <= INTUOS4L)
                        t = (t << 1) | (data[1] & 1);
                wacom_report_abs(wcombo, ABS_PRESSURE, t);
                wacom_report_abs(wcombo, ABS_TILT_X,
@@ -446,6 +448,7 @@ static void wacom_intuos_general(struct wacom_wac *wacom, void *wcombo)
 static int wacom_intuos_irq(struct wacom_wac *wacom, void *wcombo)
 {
+        struct wacom_features *features = &wacom->features;
        unsigned char *data = wacom->data;
        unsigned int t;
        int idx = 0, result;
@@ -457,7 +460,7 @@ static int wacom_intuos_irq(struct wacom_wac *wacom, void *wcombo)
        }
        /* tool number */
-        if (wacom->features->type == INTUOS)
+        if (features->type == INTUOS)
                idx = data[1] & 0x01;
        /* pad packets. Works as a second tool and is always in prox */
@@ -466,7 +469,7 @@ static int wacom_intuos_irq(struct wacom_wac *wacom, void *wcombo)
                if (wacom->tool[1] != BTN_TOOL_FINGER)
                        wacom->tool[1] = BTN_TOOL_FINGER;
-                if (wacom->features->type >= INTUOS4S && wacom->features->type <= INTUOS4L) {
+                if (features->type >= INTUOS4S && features->type <= INTUOS4L) {
                        wacom_report_key(wcombo, BTN_0, (data[2] & 0x01));
                        wacom_report_key(wcombo, BTN_1, (data[3] & 0x01));
                        wacom_report_key(wcombo, BTN_2, (data[3] & 0x02));
@@ -480,7 +483,7 @@ static int wacom_intuos_irq(struct wacom_wac *wacom, void *wcombo)
                                /* Out of proximity, clear wheel value. */
                                wacom_report_abs(wcombo, ABS_WHEEL, 0);
                        }
-                        if (wacom->features->type != INTUOS4S) {
+                        if (features->type != INTUOS4S) {
                                wacom_report_key(wcombo, BTN_7, (data[3] & 0x40));
                                wacom_report_key(wcombo, BTN_8, (data[3] & 0x80));
                        }
@@ -528,18 +531,20 @@ static int wacom_intuos_irq(struct wacom_wac *wacom, void *wcombo)
                return 0;
        /* Only large Intuos support Lense Cursor */
-        if ((wacom->tool[idx] == BTN_TOOL_LENS)
+        if (wacom->tool[idx] == BTN_TOOL_LENS &&
-                        && ((wacom->features->type == INTUOS3)
+            (features->type == INTUOS3 ||
-                        || (wacom->features->type == INTUOS3S)
+             features->type == INTUOS3S ||
-                        || (wacom->features->type == INTUOS4)
+             features->type == INTUOS4 ||
-                        || (wacom->features->type == INTUOS4S)))
+             features->type == INTUOS4S)) {
                return 0;
+        }
        /* Cintiq doesn't send data when RDY bit isn't set */
-        if ((wacom->features->type == CINTIQ) && !(data[1] & 0x40))
+        if (features->type == CINTIQ && !(data[1] & 0x40))
                 return 0;
-        if (wacom->features->type >= INTUOS3S) {
+        if (features->type >= INTUOS3S) {
                wacom_report_abs(wcombo, ABS_X, (data[2] << 9) | (data[3] << 1) | ((data[9] >> 1) & 1));
                wacom_report_abs(wcombo, ABS_Y, (data[4] << 9) | (data[5] << 1) | (data[9] & 1));
                wacom_report_abs(wcombo, ABS_DISTANCE, ((data[9] >> 2) & 0x3f));
@@ -557,7 +562,7 @@ static int wacom_intuos_irq(struct wacom_wac *wacom, void *wcombo)
                if (data[1] & 0x02) {
                        /* Rotation packet */
-                        if (wacom->features->type >= INTUOS3S) {
+                        if (features->type >= INTUOS3S) {
                                /* I3 marker pen rotation */
                                t = (data[6] << 3) | ((data[7] >> 5) & 7);
                                t = (data[7] & 0x20) ? ((t > 900) ? ((t-1) / 2 - 1350) :
@@ -570,7 +575,7 @@ static int wacom_intuos_irq(struct wacom_wac *wacom, void *wcombo)
                                        ((t - 1) / 2) : -t / 2);
                        }
-                } else if (!(data[1] & 0x10) && wacom->features->type < INTUOS3S) {
+                } else if (!(data[1] & 0x10) && features->type < INTUOS3S) {
                        /* 4D mouse packet */
                        wacom_report_key(wcombo, BTN_LEFT,   data[8] & 0x01);
                        wacom_report_key(wcombo, BTN_MIDDLE, data[8] & 0x02);
@@ -583,7 +588,7 @@ static int wacom_intuos_irq(struct wacom_wac *wacom, void *wcombo)
                } else if (wacom->tool[idx] == BTN_TOOL_MOUSE) {
                        /* I4 mouse */
-                        if (wacom->features->type >= INTUOS4S && wacom->features->type <= INTUOS4L) {
+                        if (features->type >= INTUOS4S && features->type <= INTUOS4L) {
                                wacom_report_key(wcombo, BTN_LEFT,   data[6] & 0x01);
                                wacom_report_key(wcombo, BTN_MIDDLE, data[6] & 0x02);
                                wacom_report_key(wcombo, BTN_RIGHT,  data[6] & 0x04);
@@ -604,13 +609,13 @@ static int wacom_intuos_irq(struct wacom_wac *wacom, void *wcombo)
                                                 - ((data[8] & 0x02) >> 1));
                                /* I3 2D mouse side buttons */
-                                if (wacom->features->type >= INTUOS3S && wacom->features->type <= INTUOS3L) {
+                                if (features->type >= INTUOS3S && features->type <= INTUOS3L) {
                                        wacom_report_key(wcombo, BTN_SIDE,   data[8] & 0x40);
                                        wacom_report_key(wcombo, BTN_EXTRA,  data[8] & 0x20);
                                }
                        }
-                } else if ((wacom->features->type < INTUOS3S || wacom->features->type == INTUOS3L ||
+                } else if ((features->type < INTUOS3S || features->type == INTUOS3L ||
-                                wacom->features->type == INTUOS4L) &&
+                                features->type == INTUOS4L) &&
                           wacom->tool[idx] == BTN_TOOL_LENS) {
                        /* Lens cursor packets */
                        wacom_report_key(wcombo, BTN_LEFT,   data[8] & 0x01);
@@ -718,6 +723,7 @@ static void wacom_tpc_touch_in(struct wacom_wac *wacom, void *wcombo)
 static int wacom_tpc_irq(struct wacom_wac *wacom, void *wcombo)
 {
+        struct wacom_features *features = &wacom->features;
        char *data = wacom->data;
        int prox = 0, pressure, idx = -1;
        static int stylusInProx, touchInProx = 1, touchOut;
@@ -791,7 +797,7 @@ static int wacom_tpc_irq(struct wacom_wac *wacom, void *wcombo)
                        wacom_report_abs(wcombo, ABS_Y, wacom_le16_to_cpu(&data[4]));
                        pressure = ((data[7] & 0x01) << 8) | data[6];
                        if (pressure < 0)
-                                pressure = wacom->features->pressure_max + pressure + 1;
+                                pressure = features->pressure_max + pressure + 1;
                        wacom_report_abs(wcombo, ABS_PRESSURE, pressure);
                        wacom_report_key(wcombo, BTN_TOUCH, data[1] & 0x05);
                } else {
@@ -815,7 +821,7 @@ static int wacom_tpc_irq(struct wacom_wac *wacom, void *wcombo)
 int wacom_wac_irq(struct wacom_wac *wacom_wac, void *wcombo)
 {
-        switch (wacom_wac->features->type) {
+        switch (wacom_wac->features.type) {
                case PENPARTNER:
                        return wacom_penpartner_irq(wacom_wac, wcombo);
@@ -853,7 +859,7 @@ int wacom_wac_irq(struct wacom_wac *wacom_wac, void *wcombo)
 void wacom_init_input_dev(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
 {
-        switch (wacom_wac->features->type) {
+        switch (wacom_wac->features.type) {
                case WACOM_MO:
                        input_dev_mo(input_dev, wacom_wac);
                case WACOM_G4:
@@ -888,7 +894,7 @@ void wacom_init_input_dev(struct input_dev *input_dev, struct wacom_wac *wacom_w
                        /* fall through */
                case TABLETPC:
                        input_dev_tpc(input_dev, wacom_wac);
-                        if (wacom_wac->features->device_type != BTN_TOOL_PEN)
+                        if (wacom_wac->features.device_type != BTN_TOOL_PEN)
                                break;  /* no need to process stylus stuff */
                        /* fall through */
@@ -903,153 +909,201 @@ void wacom_init_input_dev(struct input_dev *input_dev, struct wacom_wac *wacom_w
        return;
 }
-static struct wacom_features wacom_features[] = {
+static const struct wacom_features wacom_features_0x00 =
-        { "Wacom Penpartner",     WACOM_PKGLEN_PENPRTN,    5040,  3780,  255,  0, PENPARTNER },
+        { "Wacom Penpartner",     WACOM_PKGLEN_PENPRTN,    5040,  3780,  255,  0, PENPARTNER };
-        { "Wacom Graphire",       WACOM_PKGLEN_GRAPHIRE,  10206,  7422,  511, 63, GRAPHIRE },
+static const struct wacom_features wacom_features_0x10 =
-        { "Wacom Graphire2 4x5",  WACOM_PKGLEN_GRAPHIRE,  10206,  7422,  511, 63, GRAPHIRE },
+        { "Wacom Graphire",       WACOM_PKGLEN_GRAPHIRE,  10206,  7422,  511, 63, GRAPHIRE };
-        { "Wacom Graphire2 5x7",  WACOM_PKGLEN_GRAPHIRE,  13918, 10206,  511, 63, GRAPHIRE },
+static const struct wacom_features wacom_features_0x11 =
-        { "Wacom Graphire3",      WACOM_PKGLEN_GRAPHIRE,  10208,  7424,  511, 63, GRAPHIRE },
+        { "Wacom Graphire2 4x5",  WACOM_PKGLEN_GRAPHIRE,  10206,  7422,  511, 63, GRAPHIRE };
-        { "Wacom Graphire3 6x8",  WACOM_PKGLEN_GRAPHIRE,  16704, 12064,  511, 63, GRAPHIRE },
+static const struct wacom_features wacom_features_0x12 =
-        { "Wacom Graphire4 4x5",  WACOM_PKGLEN_GRAPHIRE,  10208,  7424,  511, 63, WACOM_G4 },
+        { "Wacom Graphire2 5x7",  WACOM_PKGLEN_GRAPHIRE,  13918, 10206,  511, 63, GRAPHIRE };
-        { "Wacom Graphire4 6x8",  WACOM_PKGLEN_GRAPHIRE,  16704, 12064,  511, 63, WACOM_G4 },
+static const struct wacom_features wacom_features_0x13 =
-        { "Wacom BambooFun 4x5",  WACOM_PKGLEN_BBFUN,     14760,  9225,  511, 63, WACOM_MO },
+        { "Wacom Graphire3",      WACOM_PKGLEN_GRAPHIRE,  10208,  7424,  511, 63, GRAPHIRE };
-        { "Wacom BambooFun 6x8",  WACOM_PKGLEN_BBFUN,     21648, 13530,  511, 63, WACOM_MO },
+static const struct wacom_features wacom_features_0x14 =
-        { "Wacom Bamboo1 Medium", WACOM_PKGLEN_GRAPHIRE,  16704, 12064,  511, 63, GRAPHIRE },
+        { "Wacom Graphire3 6x8",  WACOM_PKGLEN_GRAPHIRE,  16704, 12064,  511, 63, GRAPHIRE };
-        { "Wacom Volito",         WACOM_PKGLEN_GRAPHIRE,   5104,  3712,  511, 63, GRAPHIRE },
+static const struct wacom_features wacom_features_0x15 =
-        { "Wacom PenStation2",    WACOM_PKGLEN_GRAPHIRE,   3250,  2320,  255, 63, GRAPHIRE },
+        { "Wacom Graphire4 4x5",  WACOM_PKGLEN_GRAPHIRE,  10208,  7424,  511, 63, WACOM_G4 };
-        { "Wacom Volito2 4x5",    WACOM_PKGLEN_GRAPHIRE,   5104,  3712,  511, 63, GRAPHIRE },
+static const struct wacom_features wacom_features_0x16 =
-        { "Wacom Volito2 2x3",    WACOM_PKGLEN_GRAPHIRE,   3248,  2320,  511, 63, GRAPHIRE },
+        { "Wacom Graphire4 6x8",  WACOM_PKGLEN_GRAPHIRE,  16704, 12064,  511, 63, WACOM_G4 };
-        { "Wacom PenPartner2",    WACOM_PKGLEN_GRAPHIRE,   3250,  2320,  511, 63, GRAPHIRE },
+static const struct wacom_features wacom_features_0x17 =
-        { "Wacom Bamboo",         WACOM_PKGLEN_BBFUN,     14760,  9225,  511, 63, WACOM_MO },
+        { "Wacom BambooFun 4x5",  WACOM_PKGLEN_BBFUN,     14760,  9225,  511, 63, WACOM_MO };
-        { "Wacom Bamboo1",        WACOM_PKGLEN_GRAPHIRE,   5104,  3712,  511, 63, GRAPHIRE },
+static const struct wacom_features wacom_features_0x18 =
-        { "Wacom Intuos 4x5",     WACOM_PKGLEN_INTUOS,    12700, 10600, 1023, 31, INTUOS },
+        { "Wacom BambooFun 6x8",  WACOM_PKGLEN_BBFUN,     21648, 13530,  511, 63, WACOM_MO };
-        { "Wacom Intuos 6x8",     WACOM_PKGLEN_INTUOS,    20320, 16240, 1023, 31, INTUOS },
+static const struct wacom_features wacom_features_0x19 =
-        { "Wacom Intuos 9x12",    WACOM_PKGLEN_INTUOS,    30480, 24060, 1023, 31, INTUOS },
+        { "Wacom Bamboo1 Medium", WACOM_PKGLEN_GRAPHIRE,  16704, 12064,  511, 63, GRAPHIRE };
-        { "Wacom Intuos 12x12",   WACOM_PKGLEN_INTUOS,    30480, 31680, 1023, 31, INTUOS },
+static const struct wacom_features wacom_features_0x60 =
-        { "Wacom Intuos 12x18",   WACOM_PKGLEN_INTUOS,    45720, 31680, 1023, 31, INTUOS },
+        { "Wacom Volito",         WACOM_PKGLEN_GRAPHIRE,   5104,  3712,  511, 63, GRAPHIRE };
-        { "Wacom PL400",          WACOM_PKGLEN_GRAPHIRE,   5408,  4056,  255,  0, PL },
+static const struct wacom_features wacom_features_0x61 =
-        { "Wacom PL500",          WACOM_PKGLEN_GRAPHIRE,   6144,  4608,  255,  0, PL },
+        { "Wacom PenStation2",    WACOM_PKGLEN_GRAPHIRE,   3250,  2320,  255, 63, GRAPHIRE };
-        { "Wacom PL600",          WACOM_PKGLEN_GRAPHIRE,   6126,  4604,  255,  0, PL },
+static const struct wacom_features wacom_features_0x62 =
-        { "Wacom PL600SX",        WACOM_PKGLEN_GRAPHIRE,   6260,  5016,  255,  0, PL },
+        { "Wacom Volito2 4x5",    WACOM_PKGLEN_GRAPHIRE,   5104,  3712,  511, 63, GRAPHIRE };
-        { "Wacom PL550",          WACOM_PKGLEN_GRAPHIRE,   6144,  4608,  511,  0, PL },
+static const struct wacom_features wacom_features_0x63 =
-        { "Wacom PL800",          WACOM_PKGLEN_GRAPHIRE,   7220,  5780,  511,  0, PL },
+        { "Wacom Volito2 2x3",    WACOM_PKGLEN_GRAPHIRE,   3248,  2320,  511, 63, GRAPHIRE };
-        { "Wacom PL700",          WACOM_PKGLEN_GRAPHIRE,   6758,  5406,  511,  0, PL },
+static const struct wacom_features wacom_features_0x64 =
-        { "Wacom PL510",          WACOM_PKGLEN_GRAPHIRE,   6282,  4762,  511,  0, PL },
+        { "Wacom PenPartner2",    WACOM_PKGLEN_GRAPHIRE,   3250,  2320,  511, 63, GRAPHIRE };
-        { "Wacom DTU710",         WACOM_PKGLEN_GRAPHIRE,  34080, 27660,  511,  0, PL },
+static const struct wacom_features wacom_features_0x65 =
-        { "Wacom DTF521",         WACOM_PKGLEN_GRAPHIRE,   6282,  4762,  511,  0, PL },
+        { "Wacom Bamboo",         WACOM_PKGLEN_BBFUN,     14760,  9225,  511, 63, WACOM_MO };
-        { "Wacom DTF720",         WACOM_PKGLEN_GRAPHIRE,   6858,  5506,  511,  0, PL },
+static const struct wacom_features wacom_features_0x69 =
-        { "Wacom DTF720a",        WACOM_PKGLEN_GRAPHIRE,   6858,  5506,  511,  0, PL },
+        { "Wacom Bamboo1",        WACOM_PKGLEN_GRAPHIRE,   5104,  3712,  511, 63, GRAPHIRE };
-        { "Wacom Cintiq Partner", WACOM_PKGLEN_GRAPHIRE,  20480, 15360,  511,  0, PTU },
+static const struct wacom_features wacom_features_0x20 =
-        { "Wacom Intuos2 4x5",    WACOM_PKGLEN_INTUOS,    12700, 10600, 1023, 31, INTUOS },
+        { "Wacom Intuos 4x5",     WACOM_PKGLEN_INTUOS,    12700, 10600, 1023, 31, INTUOS };
-        { "Wacom Intuos2 6x8",    WACOM_PKGLEN_INTUOS,    20320, 16240, 1023, 31, INTUOS },
+static const struct wacom_features wacom_features_0x21 =
-        { "Wacom Intuos2 9x12",   WACOM_PKGLEN_INTUOS,    30480, 24060, 1023, 31, INTUOS },
+        { "Wacom Intuos 6x8",     WACOM_PKGLEN_INTUOS,    20320, 16240, 1023, 31, INTUOS };
-        { "Wacom Intuos2 12x12",  WACOM_PKGLEN_INTUOS,    30480, 31680, 1023, 31, INTUOS },
+static const struct wacom_features wacom_features_0x22 =
-        { "Wacom Intuos2 12x18",  WACOM_PKGLEN_INTUOS,    45720, 31680, 1023, 31, INTUOS },
+        { "Wacom Intuos 9x12",    WACOM_PKGLEN_INTUOS,    30480, 24060, 1023, 31, INTUOS };
-        { "Wacom Intuos3 4x5",    WACOM_PKGLEN_INTUOS,    25400, 20320, 1023, 63, INTUOS3S },
+static const struct wacom_features wacom_features_0x23 =
-        { "Wacom Intuos3 6x8",    WACOM_PKGLEN_INTUOS,    40640, 30480, 1023, 63, INTUOS3 },
+        { "Wacom Intuos 12x12",   WACOM_PKGLEN_INTUOS,    30480, 31680, 1023, 31, INTUOS };
-        { "Wacom Intuos3 9x12",   WACOM_PKGLEN_INTUOS,    60960, 45720, 1023, 63, INTUOS3 },
+static const struct wacom_features wacom_features_0x24 =
-        { "Wacom Intuos3 12x12",  WACOM_PKGLEN_INTUOS,    60960, 60960, 1023, 63, INTUOS3L },
+        { "Wacom Intuos 12x18",   WACOM_PKGLEN_INTUOS,    45720, 31680, 1023, 31, INTUOS };
-        { "Wacom Intuos3 12x19",  WACOM_PKGLEN_INTUOS,    97536, 60960, 1023, 63, INTUOS3L },
+static const struct wacom_features wacom_features_0x30 =
-        { "Wacom Intuos3 6x11",   WACOM_PKGLEN_INTUOS,    54204, 31750, 1023, 63, INTUOS3 },
+        { "Wacom PL400",          WACOM_PKGLEN_GRAPHIRE,   5408,  4056,  255,  0, PL };
-        { "Wacom Intuos3 4x6",    WACOM_PKGLEN_INTUOS,    31496, 19685, 1023, 63, INTUOS3S },
+static const struct wacom_features wacom_features_0x31 =
-        { "Wacom Intuos4 4x6",    WACOM_PKGLEN_INTUOS,    31496, 19685, 2047, 63, INTUOS4S },
+        { "Wacom PL500",          WACOM_PKGLEN_GRAPHIRE,   6144,  4608,  255,  0, PL };
-        { "Wacom Intuos4 6x9",    WACOM_PKGLEN_INTUOS,    44704, 27940, 2047, 63, INTUOS4 },
+static const struct wacom_features wacom_features_0x32 =
-        { "Wacom Intuos4 8x13",   WACOM_PKGLEN_INTUOS,    65024, 40640, 2047, 63, INTUOS4L },
+        { "Wacom PL600",          WACOM_PKGLEN_GRAPHIRE,   6126,  4604,  255,  0, PL };
-        { "Wacom Intuos4 12x19",  WACOM_PKGLEN_INTUOS,    97536, 60960, 2047, 63, INTUOS4L },
+static const struct wacom_features wacom_features_0x33 =
-        { "Wacom Cintiq 21UX",    WACOM_PKGLEN_INTUOS,    87200, 65600, 1023, 63, CINTIQ },
+        { "Wacom PL600SX",        WACOM_PKGLEN_GRAPHIRE,   6260,  5016,  255,  0, PL };
-        { "Wacom Cintiq 20WSX",   WACOM_PKGLEN_INTUOS,    86680, 54180, 1023, 63, WACOM_BEE },
+static const struct wacom_features wacom_features_0x34 =
-        { "Wacom Cintiq 12WX",    WACOM_PKGLEN_INTUOS,    53020, 33440, 1023, 63, WACOM_BEE },
+        { "Wacom PL550",          WACOM_PKGLEN_GRAPHIRE,   6144,  4608,  511,  0, PL };
-        { "Wacom DTU1931",        WACOM_PKGLEN_GRAPHIRE,  37832, 30305,  511,  0, PL },
+static const struct wacom_features wacom_features_0x35 =
-        { "Wacom ISDv4 90",       WACOM_PKGLEN_GRAPHIRE,  26202, 16325,  255,  0, TABLETPC },
+        { "Wacom PL800",          WACOM_PKGLEN_GRAPHIRE,   7220,  5780,  511,  0, PL };
-        { "Wacom ISDv4 93",       WACOM_PKGLEN_GRAPHIRE,  26202, 16325,  255,  0, TABLETPC },
+static const struct wacom_features wacom_features_0x37 =
-        { "Wacom ISDv4 9A",       WACOM_PKGLEN_GRAPHIRE,  26202, 16325,  255,  0, TABLETPC },
+        { "Wacom PL700",          WACOM_PKGLEN_GRAPHIRE,   6758,  5406,  511,  0, PL };
-        { "Wacom ISDv4 9F",       WACOM_PKGLEN_PENABLED,  26202, 16325,  255,  0, TABLETPC },
+static const struct wacom_features wacom_features_0x38 =
-        { "Wacom ISDv4 E2",       WACOM_PKGLEN_TPC2FG,    26202, 16325,  255,  0, TABLETPC2FG },
+        { "Wacom PL510",          WACOM_PKGLEN_GRAPHIRE,   6282,  4762,  511,  0, PL };
-        { "Wacom ISDv4 E3",       WACOM_PKGLEN_TPC2FG,    26202, 16325,  255,  0, TABLETPC2FG },
+static const struct wacom_features wacom_features_0x39 =
-        { "Wacom Intuos2 6x8",    WACOM_PKGLEN_INTUOS,    20320, 16240, 1023, 31, INTUOS },
+        { "Wacom DTU710",         WACOM_PKGLEN_GRAPHIRE,  34080, 27660,  511,  0, PL };
+static const struct wacom_features wacom_features_0xC4 =
+        { "Wacom DTF521",         WACOM_PKGLEN_GRAPHIRE,   6282,  4762,  511,  0, PL };
+static const struct wacom_features wacom_features_0xC0 =
+        { "Wacom DTF720",         WACOM_PKGLEN_GRAPHIRE,   6858,  5506,  511,  0, PL };
+static const struct wacom_features wacom_features_0xC2 =
+        { "Wacom DTF720a",        WACOM_PKGLEN_GRAPHIRE,   6858,  5506,  511,  0, PL };
+static const struct wacom_features wacom_features_0x03 =
+        { "Wacom Cintiq Partner", WACOM_PKGLEN_GRAPHIRE,  20480, 15360,  511,  0, PTU };
+static const struct wacom_features wacom_features_0x41 =
+        { "Wacom Intuos2 4x5",    WACOM_PKGLEN_INTUOS,    12700, 10600, 1023, 31, INTUOS };
+static const struct wacom_features wacom_features_0x42 =
+        { "Wacom Intuos2 6x8",    WACOM_PKGLEN_INTUOS,    20320, 16240, 1023, 31, INTUOS };
+static const struct wacom_features wacom_features_0x43 =
+        { "Wacom Intuos2 9x12",   WACOM_PKGLEN_INTUOS,    30480, 24060, 1023, 31, INTUOS };
+static const struct wacom_features wacom_features_0x44 =
+        { "Wacom Intuos2 12x12",  WACOM_PKGLEN_INTUOS,    30480, 31680, 1023, 31, INTUOS };
+static const struct wacom_features wacom_features_0x45 =
+        { "Wacom Intuos2 12x18",  WACOM_PKGLEN_INTUOS,    45720, 31680, 1023, 31, INTUOS };
+static const struct wacom_features wacom_features_0xB0 =
+        { "Wacom Intuos3 4x5",    WACOM_PKGLEN_INTUOS,    25400, 20320, 1023, 63, INTUOS3S };
+static const struct wacom_features wacom_features_0xB1 =
+        { "Wacom Intuos3 6x8",    WACOM_PKGLEN_INTUOS,    40640, 30480, 1023, 63, INTUOS3 };
+static const struct wacom_features wacom_features_0xB2 =
+        { "Wacom Intuos3 9x12",   WACOM_PKGLEN_INTUOS,    60960, 45720, 1023, 63, INTUOS3 };
+static const struct wacom_features wacom_features_0xB3 =
+        { "Wacom Intuos3 12x12",  WACOM_PKGLEN_INTUOS,    60960, 60960, 1023, 63, INTUOS3L };
+static const struct wacom_features wacom_features_0xB4 =
+        { "Wacom Intuos3 12x19",  WACOM_PKGLEN_INTUOS,    97536, 60960, 1023, 63, INTUOS3L };
+static const struct wacom_features wacom_features_0xB5 =
+        { "Wacom Intuos3 6x11",   WACOM_PKGLEN_INTUOS,    54204, 31750, 1023, 63, INTUOS3 };
+static const struct wacom_features wacom_features_0xB7 =
+        { "Wacom Intuos3 4x6",    WACOM_PKGLEN_INTUOS,    31496, 19685, 1023, 63, INTUOS3S };
+static const struct wacom_features wacom_features_0xB8 =
+        { "Wacom Intuos4 4x6",    WACOM_PKGLEN_INTUOS,    31496, 19685, 2047, 63, INTUOS4S };
+static const struct wacom_features wacom_features_0xB9 =
+        { "Wacom Intuos4 6x9",    WACOM_PKGLEN_INTUOS,    44704, 27940, 2047, 63, INTUOS4 };
+static const struct wacom_features wacom_features_0xBA =
+        { "Wacom Intuos4 8x13",   WACOM_PKGLEN_INTUOS,    65024, 40640, 2047, 63, INTUOS4L };
+static const struct wacom_features wacom_features_0xBB =
+        { "Wacom Intuos4 12x19",  WACOM_PKGLEN_INTUOS,    97536, 60960, 2047, 63, INTUOS4L };
+static const struct wacom_features wacom_features_0x3F =
+        { "Wacom Cintiq 21UX",    WACOM_PKGLEN_INTUOS,    87200, 65600, 1023, 63, CINTIQ };
+static const struct wacom_features wacom_features_0xC5 =
+        { "Wacom Cintiq 20WSX",   WACOM_PKGLEN_INTUOS,    86680, 54180, 1023, 63, WACOM_BEE };
+static const struct wacom_features wacom_features_0xC6 =
+        { "Wacom Cintiq 12WX",    WACOM_PKGLEN_INTUOS,    53020, 33440, 1023, 63, WACOM_BEE };
+static const struct wacom_features wacom_features_0xC7 =
+        { "Wacom DTU1931",        WACOM_PKGLEN_GRAPHIRE,  37832, 30305,  511,  0, PL };
+static const struct wacom_features wacom_features_0x90 =
+        { "Wacom ISDv4 90",       WACOM_PKGLEN_GRAPHIRE,  26202, 16325,  255,  0, TABLETPC };
+static const struct wacom_features wacom_features_0x93 =
+        { "Wacom ISDv4 93",       WACOM_PKGLEN_GRAPHIRE,  26202, 16325,  255,  0, TABLETPC };
+static const struct wacom_features wacom_features_0x9A =
+        { "Wacom ISDv4 9A",       WACOM_PKGLEN_GRAPHIRE,  26202, 16325,  255,  0, TABLETPC };
+static const struct wacom_features wacom_features_0x9F =
+        { "Wacom ISDv4 9F",       WACOM_PKGLEN_PENABLED,  26202, 16325,  255,  0, TABLETPC };
+static const struct wacom_features wacom_features_0xE2 =
+        { "Wacom ISDv4 E2",       WACOM_PKGLEN_TPC2FG,    26202, 16325,  255,  0, TABLETPC2FG };
+static const struct wacom_features wacom_features_0xE3 =
+        { "Wacom ISDv4 E3",       WACOM_PKGLEN_TPC2FG,    26202, 16325,  255,  0, TABLETPC2FG };
+static const struct wacom_features wacom_features_0x47 =
+        { "Wacom Intuos2 6x8",    WACOM_PKGLEN_INTUOS,    20320, 16240, 1023, 31, INTUOS };
+#define USB_DEVICE_WACOM(prod)                                  \
+        USB_DEVICE(USB_VENDOR_ID_WACOM, prod),                  \
+        .driver_info = (kernel_ulong_t)&wacom_features_##prod
+const struct usb_device_id wacom_ids[] = {
+        { USB_DEVICE_WACOM(0x00) },
+        { USB_DEVICE_WACOM(0x10) },
+        { USB_DEVICE_WACOM(0x11) },
+        { USB_DEVICE_WACOM(0x12) },
+        { USB_DEVICE_WACOM(0x13) },
+        { USB_DEVICE_WACOM(0x14) },
+        { USB_DEVICE_WACOM(0x15) },
+        { USB_DEVICE_WACOM(0x16) },
+        { USB_DEVICE_WACOM(0x17) },
+        { USB_DEVICE_WACOM(0x18) },
+        { USB_DEVICE_WACOM(0x19) },
+        { USB_DEVICE_WACOM(0x60) },
+        { USB_DEVICE_WACOM(0x61) },
+        { USB_DEVICE_WACOM(0x62) },
+        { USB_DEVICE_WACOM(0x63) },
+        { USB_DEVICE_WACOM(0x64) },
+        { USB_DEVICE_WACOM(0x65) },
+        { USB_DEVICE_WACOM(0x69) },
+        { USB_DEVICE_WACOM(0x20) },
+        { USB_DEVICE_WACOM(0x21) },
+        { USB_DEVICE_WACOM(0x22) },
+        { USB_DEVICE_WACOM(0x23) },
+        { USB_DEVICE_WACOM(0x24) },
+        { USB_DEVICE_WACOM(0x30) },
+        { USB_DEVICE_WACOM(0x31) },
+        { USB_DEVICE_WACOM(0x32) },
+        { USB_DEVICE_WACOM(0x33) },
+        { USB_DEVICE_WACOM(0x34) },
+        { USB_DEVICE_WACOM(0x35) },
+        { USB_DEVICE_WACOM(0x37) },
+        { USB_DEVICE_WACOM(0x38) },
+        { USB_DEVICE_WACOM(0x39) },
+        { USB_DEVICE_WACOM(0xC4) },
+        { USB_DEVICE_WACOM(0xC0) },
+        { USB_DEVICE_WACOM(0xC2) },
+        { USB_DEVICE_WACOM(0x03) },
+        { USB_DEVICE_WACOM(0x41) },
+        { USB_DEVICE_WACOM(0x42) },
+        { USB_DEVICE_WACOM(0x43) },
+        { USB_DEVICE_WACOM(0x44) },
+        { USB_DEVICE_WACOM(0x45) },
+        { USB_DEVICE_WACOM(0xB0) },
+        { USB_DEVICE_WACOM(0xB1) },
+        { USB_DEVICE_WACOM(0xB2) },
+        { USB_DEVICE_WACOM(0xB3) },
+        { USB_DEVICE_WACOM(0xB4) },
+        { USB_DEVICE_WACOM(0xB5) },
+        { USB_DEVICE_WACOM(0xB7) },
+        { USB_DEVICE_WACOM(0xB8) },
+        { USB_DEVICE_WACOM(0xB9) },
+        { USB_DEVICE_WACOM(0xBA) },
+        { USB_DEVICE_WACOM(0xBB) },
+        { USB_DEVICE_WACOM(0x3F) },
+        { USB_DEVICE_WACOM(0xC5) },
+        { USB_DEVICE_WACOM(0xC6) },
+        { USB_DEVICE_WACOM(0xC7) },
+        { USB_DEVICE_WACOM(0x90) },
+        { USB_DEVICE_WACOM(0x93) },
+        { USB_DEVICE_WACOM(0x9A) },
+        { USB_DEVICE_WACOM(0x9F) },
+        { USB_DEVICE_WACOM(0xE2) },
+        { USB_DEVICE_WACOM(0xE3) },
+        { USB_DEVICE_WACOM(0x47) },
        { }
 };
-static struct usb_device_id wacom_ids[] = {
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x00) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x10) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x11) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x12) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x13) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x14) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x15) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x16) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x17) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x18) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x19) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x60) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x61) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x62) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x63) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x64) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x65) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x69) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x20) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x21) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x22) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x23) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x24) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x30) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x31) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x32) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x33) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x34) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x35) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x37) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x38) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x39) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC4) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC0) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC2) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x03) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x41) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x42) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x43) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x44) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x45) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB0) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB1) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB2) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB3) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB4) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB5) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB7) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB8) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB9) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xBA) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xBB) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x3F) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC5) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC6) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC7) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x90) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x93) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x9A) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x9F) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xE2) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xE3) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x47) },
-        { }
-};
-const struct usb_device_id *get_device_table(void)
-{
-        const struct usb_device_id *id_table = wacom_ids;
-        return id_table;
-}
-struct wacom_features * get_wacom_feature(const struct usb_device_id *id)
-{
-        int index = id - wacom_ids;
-        struct wacom_features *wf = &wacom_features[index];
-        return wf;
-}
 MODULE_DEVICE_TABLE(usb, wacom_ids);
diff --git a/drivers/input/tablet/wacom_wac.h b/drivers/input/tablet/wacom_wac.h
index ee01e190278..8590b1e8ec3 100644
--- a/drivers/input/tablet/wacom_wac.h
+++ b/drivers/input/tablet/wacom_wac.h
@@ -15,11 +15,11 @@
 /* packet length for individual models */
 #define WACOM_PKGLEN_PENPRTN     7
 #define WACOM_PKGLEN_GRAPHIRE    8
-#define WACOM_PKGLEN_BBFUN       9
+#define WACOM_PKGLEN_BBFUN       9
-#define WACOM_PKGLEN_INTUOS     10
+#define WACOM_PKGLEN_INTUOS     10
 #define WACOM_PKGLEN_PENABLED    8
 #define WACOM_PKGLEN_TPC1FG      5
-#define WACOM_PKGLEN_TPC2FG     14
+#define WACOM_PKGLEN_TPC2FG     14
 /* device IDs */
 #define STYLUS_DEVICE_ID        0x02
@@ -58,7 +58,7 @@ enum {
 };
 struct wacom_features {
-        char *name;
+        const char *name;
        int pktlen;
        int x_max;
        int y_max;
@@ -73,11 +73,12 @@ struct wacom_features {
 };
 struct wacom_wac {
+        char name[64];
        unsigned char *data;
-        int tool[2];
+        int tool[2];
-        int id[2];
+        int id[2];
-        __u32 serial[2];
+        __u32 serial[2];
-        struct wacom_features *features;
+        struct wacom_features features;
 };
 #endif
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index dfafc76da4f..6457e060ae4 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -90,7 +90,6 @@ config TOUCHSCREEN_CORGI
        tristate "SharpSL (Corgi and Spitz series) touchscreen driver (DEPRECATED)"
        depends on PXA_SHARPSL
        select CORGI_SSP_DEPRECATED
-        default y
        help
          Say Y here to enable the driver for the touchscreen on the
          Sharp SL-C7xx and SL-Cxx00 series of PDAs.
@@ -537,6 +536,11 @@ config TOUCHSCREEN_USB_ETT_TC5UH
        bool "ET&T TC5UH touchscreen controler support" if EMBEDDED
        depends on TOUCHSCREEN_USB_COMPOSITE
+config TOUCHSCREEN_USB_NEXIO
+        default y
+        bool "NEXIO/iNexio device support" if EMBEDDED
+        depends on TOUCHSCREEN_USB_COMPOSITE
 config TOUCHSCREEN_TOUCHIT213
        tristate "Sahara TouchIT-213 touchscreen"
        select SERIO
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
index 52d2ca147d8..8b05d8e9754 100644
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@ -27,6 +27,7 @@
 #include <linux/gpio.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/ads7846.h>
+#include <linux/regulator/consumer.h>
 #include <asm/irq.h>
 /*
@@ -85,6 +86,7 @@ struct ads7846 {
        char                    name[32];
        struct spi_device       *spi;
+        struct regulator        *reg;
 #if defined(CONFIG_HWMON) || defined(CONFIG_HWMON_MODULE)
        struct attribute_group  *attr_group;
@@ -788,6 +790,8 @@ static void ads7846_disable(struct ads7846 *ts)
                }
        }
+        regulator_disable(ts->reg);
        /* we know the chip's in lowpower mode since we always
         * leave it that way after every request
         */
@@ -799,6 +803,8 @@ static void ads7846_enable(struct ads7846 *ts)
        if (!ts->disabled)
                return;
+        regulator_enable(ts->reg);
        ts->disabled = 0;
        ts->irq_disabled = 0;
        enable_irq(ts->spi->irq);
@@ -1139,6 +1145,19 @@ static int __devinit ads7846_probe(struct spi_device *spi)
        ts->last_msg = m;
+        ts->reg = regulator_get(&spi->dev, "vcc");
+        if (IS_ERR(ts->reg)) {
+                dev_err(&spi->dev, "unable to get regulator: %ld\n",
+                        PTR_ERR(ts->reg));
+                goto err_free_gpio;
+        }
+        err = regulator_enable(ts->reg);
+        if (err) {
+                dev_err(&spi->dev, "unable to enable regulator: %d\n", err);
+                goto err_put_regulator;
+        }
        if (request_irq(spi->irq, ads7846_irq, IRQF_TRIGGER_FALLING,
                        spi->dev.driver->name, ts)) {
                dev_info(&spi->dev,
@@ -1148,7 +1167,7 @@ static int __devinit ads7846_probe(struct spi_device *spi)
                                  spi->dev.driver->name, ts);
                if (err) {
                        dev_dbg(&spi->dev, "irq %d busy?\n", spi->irq);
-                        goto err_free_gpio;
+                        goto err_disable_regulator;
                }
        }
@@ -1180,6 +1199,10 @@ static int __devinit ads7846_probe(struct spi_device *spi)
        ads784x_hwmon_unregister(spi, ts);
 err_free_irq:
        free_irq(spi->irq, ts);
+ err_disable_regulator:
+        regulator_disable(ts->reg);
+ err_put_regulator:
+        regulator_put(ts->reg);
 err_free_gpio:
        if (ts->gpio_pendown != -1)
                gpio_free(ts->gpio_pendown);
@@ -1208,6 +1231,9 @@ static int __devexit ads7846_remove(struct spi_device *spi)
        /* suspend left the IRQ disabled */
        enable_irq(ts->spi->irq);
+        regulator_disable(ts->reg);
+        regulator_put(ts->reg);
        if (ts->gpio_pendown != -1)
                gpio_free(ts->gpio_pendown);
diff --git a/drivers/input/touchscreen/elo.c b/drivers/input/touchscreen/elo.c
index 8f38c5e55ce..486d31ba9c0 100644
--- a/drivers/input/touchscreen/elo.c
+++ b/drivers/input/touchscreen/elo.c
@@ -72,45 +72,49 @@ static void elo_process_data_10(struct elo *elo, unsigned char data)
        struct input_dev *dev = elo->dev;
        elo->data[elo->idx] = data;
-        switch (elo->idx++) {
-                case 0:
-                        elo->csum = 0xaa;
-                        if (data != ELO10_LEAD_BYTE) {
-                                pr_debug("elo: unsynchronized data: 0x%02x\n", data);
-                                elo->idx = 0;
-                        }
-                        break;
-                case 9:
+        switch (elo->idx++) {
+        case 0:
+                elo->csum = 0xaa;
+                if (data != ELO10_LEAD_BYTE) {
+                        dev_dbg(&elo->serio->dev,
+                                "unsynchronized data: 0x%02x\n", data);
                        elo->idx = 0;
-                        if (data != elo->csum) {
+                }
-                                pr_debug("elo: bad checksum: 0x%02x, expected 0x%02x\n",
+                break;
-                                         data, elo->csum);
-                                break;
+        case 9:
-                        }
+                elo->idx = 0;
-                        if (elo->data[1] != elo->expected_packet) {
+                if (data != elo->csum) {
-                                if (elo->data[1] != ELO10_TOUCH_PACKET)
+                        dev_dbg(&elo->serio->dev,
-                                        pr_debug("elo: unexpected packet: 0x%02x\n",
+                                "bad checksum: 0x%02x, expected 0x%02x\n",
-                                                 elo->data[1]);
+                                 data, elo->csum);
-                                break;
+                        break;
-                        }
+                }
-                        if (likely(elo->data[1] == ELO10_TOUCH_PACKET)) {
+                if (elo->data[1] != elo->expected_packet) {
-                                input_report_abs(dev, ABS_X, (elo->data[4] << 8) | elo->data[3]);
+                        if (elo->data[1] != ELO10_TOUCH_PACKET)
-                                input_report_abs(dev, ABS_Y, (elo->data[6] << 8) | elo->data[5]);
+                                dev_dbg(&elo->serio->dev,
-                                if (elo->data[2] & ELO10_PRESSURE)
+                                        "unexpected packet: 0x%02x\n",
-                                        input_report_abs(dev, ABS_PRESSURE,
+                                         elo->data[1]);
-                                                        (elo->data[8] << 8) | elo->data[7]);
-                                input_report_key(dev, BTN_TOUCH, elo->data[2] & ELO10_TOUCH);
-                                input_sync(dev);
-                        } else if (elo->data[1] == ELO10_ACK_PACKET) {
-                                if (elo->data[2] == '0')
-                                        elo->expected_packet = ELO10_TOUCH_PACKET;
-                                complete(&elo->cmd_done);
-                        } else {
-                                memcpy(elo->response, &elo->data[1], ELO10_PACKET_LEN);
-                                elo->expected_packet = ELO10_ACK_PACKET;
-                        }
                        break;
+                }
+                if (likely(elo->data[1] == ELO10_TOUCH_PACKET)) {
+                        input_report_abs(dev, ABS_X, (elo->data[4] << 8) | elo->data[3]);
+                        input_report_abs(dev, ABS_Y, (elo->data[6] << 8) | elo->data[5]);
+                        if (elo->data[2] & ELO10_PRESSURE)
+                                input_report_abs(dev, ABS_PRESSURE,
+                                                (elo->data[8] << 8) | elo->data[7]);
+                        input_report_key(dev, BTN_TOUCH, elo->data[2] & ELO10_TOUCH);
+                        input_sync(dev);
+                } else if (elo->data[1] == ELO10_ACK_PACKET) {
+                        if (elo->data[2] == '0')
+                                elo->expected_packet = ELO10_TOUCH_PACKET;
+                        complete(&elo->cmd_done);
+                } else {
+                        memcpy(elo->response, &elo->data[1], ELO10_PACKET_LEN);
+                        elo->expected_packet = ELO10_ACK_PACKET;
+                }
+                break;
        }
        elo->csum += data;
 }
@@ -123,42 +127,53 @@ static void elo_process_data_6(struct elo *elo, unsigned char data)
        switch (elo->idx++) {
-                case 0: if ((data & 0xc0) != 0xc0) elo->idx = 0; break;
+        case 0:
-                case 1: if ((data & 0xc0) != 0x80) elo->idx = 0; break;
+                if ((data & 0xc0) != 0xc0)
-                case 2: if ((data & 0xc0) != 0x40) elo->idx = 0; break;
+                        elo->idx = 0;
+                break;
-                case 3:
-                        if (data & 0xc0) {
-                                elo->idx = 0;
-                                break;
-                        }
-                        input_report_abs(dev, ABS_X, ((elo->data[0] & 0x3f) << 6) | (elo->data[1] & 0x3f));
+        case 1:
-                        input_report_abs(dev, ABS_Y, ((elo->data[2] & 0x3f) << 6) | (elo->data[3] & 0x3f));
+                if ((data & 0xc0) != 0x80)
+                        elo->idx = 0;
+                break;
-                        if (elo->id == 2) {
+        case 2:
-                                input_report_key(dev, BTN_TOUCH, 1);
+                if ((data & 0xc0) != 0x40)
-                                input_sync(dev);
+                        elo->idx = 0;
-                                elo->idx = 0;
+                break;
-                        }
+        case 3:
+                if (data & 0xc0) {
+                        elo->idx = 0;
                        break;
+                }
-                case 4:
+                input_report_abs(dev, ABS_X, ((elo->data[0] & 0x3f) << 6) | (elo->data[1] & 0x3f));
-                        if (data) {
+                input_report_abs(dev, ABS_Y, ((elo->data[2] & 0x3f) << 6) | (elo->data[3] & 0x3f));
-                                input_sync(dev);
-                                elo->idx = 0;
-                        }
-                        break;
-                case 5:
+                if (elo->id == 2) {
-                        if ((data & 0xf0) == 0) {
+                        input_report_key(dev, BTN_TOUCH, 1);
-                                input_report_abs(dev, ABS_PRESSURE, elo->data[5]);
-                                input_report_key(dev, BTN_TOUCH, !!elo->data[5]);
-                        }
                        input_sync(dev);
                        elo->idx = 0;
-                        break;
+                }
+                break;
+        case 4:
+                if (data) {
+                        input_sync(dev);
+                        elo->idx = 0;
+                }
+                break;
+        case 5:
+                if ((data & 0xf0) == 0) {
+                        input_report_abs(dev, ABS_PRESSURE, elo->data[5]);
+                        input_report_key(dev, BTN_TOUCH, !!elo->data[5]);
+                }
+                input_sync(dev);
+                elo->idx = 0;
+                break;
        }
 }
@@ -170,17 +185,17 @@ static void elo_process_data_3(struct elo *elo, unsigned char data)
        switch (elo->idx++) {
-                case 0:
+        case 0:
-                        if ((data & 0x7f) != 0x01)
+                if ((data & 0x7f) != 0x01)
-                                elo->idx = 0;
-                        break;
-                case 2:
-                        input_report_key(dev, BTN_TOUCH, !(elo->data[1] & 0x80));
-                        input_report_abs(dev, ABS_X, elo->data[1]);
-                        input_report_abs(dev, ABS_Y, elo->data[2]);
-                        input_sync(dev);
                        elo->idx = 0;
-                        break;
+                break;
+        case 2:
+                input_report_key(dev, BTN_TOUCH, !(elo->data[1] & 0x80));
+                input_report_abs(dev, ABS_X, elo->data[1]);
+                input_report_abs(dev, ABS_Y, elo->data[2]);
+                input_sync(dev);
+                elo->idx = 0;
+                break;
        }
 }
@@ -189,19 +204,19 @@ static irqreturn_t elo_interrupt(struct serio *serio,
 {
        struct elo *elo = serio_get_drvdata(serio);
-        switch(elo->id) {
+        switch (elo->id) {
-                case 0:
+        case 0:
-                        elo_process_data_10(elo, data);
+                elo_process_data_10(elo, data);
-                        break;
+                break;
-                case 1:
+        case 1:
-                case 2:
+        case 2:
-                        elo_process_data_6(elo, data);
+                elo_process_data_6(elo, data);
-                        break;
+                break;
-                case 3:
+        case 3:
-                        elo_process_data_3(elo, data);
+                elo_process_data_3(elo, data);
-                        break;
+                break;
        }
        return IRQ_HANDLED;
@@ -261,10 +276,10 @@ static int elo_setup_10(struct elo *elo)
        if (packet[3] & ELO10_PRESSURE)
                input_set_abs_params(dev, ABS_PRESSURE, 0, 255, 0, 0);
-        printk(KERN_INFO "elo: %sTouch touchscreen, fw: %02x.%02x, "
+        dev_info(&elo->serio->dev,
-                "features: 0x%02x, controller: 0x%02x\n",
+                 "%sTouch touchscreen, fw: %02x.%02x, features: 0x%02x, controller: 0x%02x\n",
-                elo_types[(packet[1] -'0') & 0x03],
+                 elo_types[(packet[1] -'0') & 0x03],
-                packet[5], packet[4], packet[3], packet[7]);
+                 packet[5], packet[4], packet[3], packet[7]);
        return 0;
 }
@@ -330,24 +345,24 @@ static int elo_connect(struct serio *serio, struct serio_driver *drv)
        switch (elo->id) {
-                case 0: /* 10-byte protocol */
+        case 0: /* 10-byte protocol */
-                        if (elo_setup_10(elo))
+                if (elo_setup_10(elo))
-                                goto fail3;
+                        goto fail3;
-                        break;
+                break;
-                case 1: /* 6-byte protocol */
+        case 1: /* 6-byte protocol */
-                        input_set_abs_params(input_dev, ABS_PRESSURE, 0, 15, 0, 0);
+                input_set_abs_params(input_dev, ABS_PRESSURE, 0, 15, 0, 0);
-                case 2: /* 4-byte protocol */
+        case 2: /* 4-byte protocol */
-                        input_set_abs_params(input_dev, ABS_X, 96, 4000, 0, 0);
+                input_set_abs_params(input_dev, ABS_X, 96, 4000, 0, 0);
-                        input_set_abs_params(input_dev, ABS_Y, 96, 4000, 0, 0);
+                input_set_abs_params(input_dev, ABS_Y, 96, 4000, 0, 0);
-                        break;
+                break;
-                case 3: /* 3-byte protocol */
+        case 3: /* 3-byte protocol */
-                        input_set_abs_params(input_dev, ABS_X, 0, 255, 0, 0);
+                input_set_abs_params(input_dev, ABS_X, 0, 255, 0, 0);
-                        input_set_abs_params(input_dev, ABS_Y, 0, 255, 0, 0);
+                input_set_abs_params(input_dev, ABS_Y, 0, 255, 0, 0);
-                        break;
+                break;
        }
        err = input_register_device(elo->dev);
diff --git a/drivers/input/touchscreen/mainstone-wm97xx.c b/drivers/input/touchscreen/mainstone-wm97xx.c
index 6cdcf2a6e03..b6b8b1c7ece 100644
--- a/drivers/input/touchscreen/mainstone-wm97xx.c
+++ b/drivers/input/touchscreen/mainstone-wm97xx.c
@@ -153,6 +153,9 @@ static int wm97xx_acc_pen_down(struct wm97xx *wm)
                if (pressure)
                        p = MODR;
+                dev_dbg(wm->dev, "Raw coordinates: x=%x, y=%x, p=%x\n",
+                        x, y, p);
                /* are samples valid */
                if ((x & WM97XX_ADCSRC_MASK) != WM97XX_ADCSEL_X ||
                    (y & WM97XX_ADCSRC_MASK) != WM97XX_ADCSEL_Y ||
diff --git a/drivers/input/touchscreen/s3c2410_ts.c b/drivers/input/touchscreen/s3c2410_ts.c
index 6386b441ef8..3755a47d053 100644
--- a/drivers/input/touchscreen/s3c2410_ts.c
+++ b/drivers/input/touchscreen/s3c2410_ts.c
@@ -128,27 +128,29 @@ static void touch_timer_fire(unsigned long data)
        down = get_down(data0, data1);
-        if (ts.count == (1 << ts.shift)) {
+        if (down) {
-                ts.xp >>= ts.shift;
+                if (ts.count == (1 << ts.shift)) {
-                ts.yp >>= ts.shift;
+                        ts.xp >>= ts.shift;
+                        ts.yp >>= ts.shift;
-                dev_dbg(ts.dev, "%s: X=%lu, Y=%lu, count=%d\n",
+                        dev_dbg(ts.dev, "%s: X=%lu, Y=%lu, count=%d\n",
-                        __func__, ts.xp, ts.yp, ts.count);
+                                __func__, ts.xp, ts.yp, ts.count);
-                input_report_abs(ts.input, ABS_X, ts.xp);
+                        input_report_abs(ts.input, ABS_X, ts.xp);
-                input_report_abs(ts.input, ABS_Y, ts.yp);
+                        input_report_abs(ts.input, ABS_Y, ts.yp);
-                input_report_key(ts.input, BTN_TOUCH, 1);
+                        input_report_key(ts.input, BTN_TOUCH, 1);
-                input_sync(ts.input);
+                        input_sync(ts.input);
-                ts.xp = 0;
+                        ts.xp = 0;
-                ts.yp = 0;
+                        ts.yp = 0;
-                ts.count = 0;
+                        ts.count = 0;
-        }
+                }
-        if (down) {
                s3c_adc_start(ts.client, 0, 1 << ts.shift);
        } else {
+                ts.xp = 0;
+                ts.yp = 0;
                ts.count = 0;
                input_report_key(ts.input, BTN_TOUCH, 0);
@@ -401,6 +403,7 @@ static int s3c2410ts_resume(struct device *dev)
        struct s3c2410_ts_mach_info *info = pdev->dev.platform_data;
        clk_enable(ts.clock);
+        enable_irq(ts.irq_tc);
        /* Initialise registers */
        if ((info->delay & 0xffff) > 0)
diff --git a/drivers/input/touchscreen/tsc2007.c b/drivers/input/touchscreen/tsc2007.c
index 7ef0d1420d3..be23780e8a3 100644
--- a/drivers/input/touchscreen/tsc2007.c
+++ b/drivers/input/touchscreen/tsc2007.c
@@ -358,7 +358,7 @@ static int __devexit tsc2007_remove(struct i2c_client *client)
        return 0;
 }
-static struct i2c_device_id tsc2007_idtable[] = {
+static const struct i2c_device_id tsc2007_idtable[] = {
        { "tsc2007", 0 },
        { }
 };
diff --git a/drivers/input/touchscreen/usbtouchscreen.c b/drivers/input/touchscreen/usbtouchscreen.c
index 5256123a522..99330bbdbac 100644
--- a/drivers/input/touchscreen/usbtouchscreen.c
+++ b/drivers/input/touchscreen/usbtouchscreen.c
@@ -15,6 +15,7 @@
 *  - GoTop Super_Q2/GogoPen/PenPower tablets
 *  - JASTEC USB touch controller/DigiTech DTR-02U
 *  - Zytronic capacitive touchscreen
+ *  - NEXIO/iNexio
 *
 * Copyright (C) 2004-2007 by Daniel Ritz <daniel.ritz@gmx.ch>
 * Copyright (C) by Todd E. Johnson (mtouchusb.c)
@@ -95,6 +96,7 @@ struct usbtouch_device_info {
        int  (*read_data)   (struct usbtouch_usb *usbtouch, unsigned char *pkt);
        int  (*init)        (struct usbtouch_usb *usbtouch);
+        void (*exit)        (struct usbtouch_usb *usbtouch);
 };
 /* a usbtouch device */
@@ -104,11 +106,12 @@ struct usbtouch_usb {
        unsigned char *buffer;
        int buf_len;
        struct urb *irq;
-        struct usb_device *udev;
+        struct usb_interface *interface;
        struct input_dev *input;
        struct usbtouch_device_info *type;
        char name[128];
        char phys[64];
+        void *priv;
        int x, y;
        int touch, press;
@@ -133,6 +136,7 @@ enum {
        DEVTYPE_E2I,
        DEVTYPE_ZYTRONIC,
        DEVTYPE_TC5UH,
+        DEVTYPE_NEXIO,
 };
 #define USB_DEVICE_HID_CLASS(vend, prod) \
@@ -144,7 +148,7 @@ enum {
        .bInterfaceClass = USB_INTERFACE_CLASS_HID, \
        .bInterfaceProtocol = USB_INTERFACE_PROTOCOL_MOUSE
-static struct usb_device_id usbtouch_devices[] = {
+static const struct usb_device_id usbtouch_devices[] = {
 #ifdef CONFIG_TOUCHSCREEN_USB_EGALAX
        /* ignore the HID capable devices, handled by usbhid */
        {USB_DEVICE_HID_CLASS(0x0eef, 0x0001), .driver_info = DEVTYPE_IGNORE},
@@ -222,6 +226,14 @@ static struct usb_device_id usbtouch_devices[] = {
        {USB_DEVICE(0x0664, 0x0309), .driver_info = DEVTYPE_TC5UH},
 #endif
+#ifdef CONFIG_TOUCHSCREEN_USB_NEXIO
+        /* data interface only */
+        {USB_DEVICE_AND_INTERFACE_INFO(0x10f0, 0x2002, 0x0a, 0x00, 0x00),
+                .driver_info = DEVTYPE_NEXIO},
+        {USB_DEVICE_AND_INTERFACE_INFO(0x1870, 0x0001, 0x0a, 0x00, 0x00),
+                .driver_info = DEVTYPE_NEXIO},
+#endif
        {}
 };
@@ -234,8 +246,9 @@ static struct usb_device_id usbtouch_devices[] = {
 static int e2i_init(struct usbtouch_usb *usbtouch)
 {
        int ret;
+        struct usb_device *udev = interface_to_usbdev(usbtouch->interface);
-        ret = usb_control_msg(usbtouch->udev, usb_rcvctrlpipe(usbtouch->udev, 0),
+        ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
                              0x01, 0x02, 0x0000, 0x0081,
                              NULL, 0, USB_CTRL_SET_TIMEOUT);
@@ -344,8 +357,9 @@ static int mtouch_read_data(struct usbtouch_usb *dev, unsigned char *pkt)
 static int mtouch_init(struct usbtouch_usb *usbtouch)
 {
        int ret, i;
+        struct usb_device *udev = interface_to_usbdev(usbtouch->interface);
-        ret = usb_control_msg(usbtouch->udev, usb_rcvctrlpipe(usbtouch->udev, 0),
+        ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
                              MTOUCHUSB_RESET,
                              USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
                              1, 0, NULL, 0, USB_CTRL_SET_TIMEOUT);
@@ -356,7 +370,7 @@ static int mtouch_init(struct usbtouch_usb *usbtouch)
        msleep(150);
        for (i = 0; i < 3; i++) {
-                ret = usb_control_msg(usbtouch->udev, usb_rcvctrlpipe(usbtouch->udev, 0),
+                ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
                                      MTOUCHUSB_ASYNC_REPORT,
                                      USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
                                      1, 1, NULL, 0, USB_CTRL_SET_TIMEOUT);
@@ -489,7 +503,7 @@ static int gunze_read_data(struct usbtouch_usb *dev, unsigned char *pkt)
 static int dmc_tsc10_init(struct usbtouch_usb *usbtouch)
 {
-        struct usb_device *dev = usbtouch->udev;
+        struct usb_device *dev = interface_to_usbdev(usbtouch->interface);
        int ret = -ENOMEM;
        unsigned char *buf;
@@ -690,6 +704,229 @@ static int zytronic_read_data(struct usbtouch_usb *dev, unsigned char *pkt)
 #endif
 /*****************************************************************************
+ * NEXIO Part
+ */
+#ifdef CONFIG_TOUCHSCREEN_USB_NEXIO
+#define NEXIO_TIMEOUT   5000
+#define NEXIO_BUFSIZE   1024
+#define NEXIO_THRESHOLD 50
+struct nexio_priv {
+        struct urb *ack;
+        unsigned char *ack_buf;
+};
+struct nexio_touch_packet {
+        u8      flags;          /* 0xe1 = touch, 0xe1 = release */
+        __be16  data_len;       /* total bytes of touch data */
+        __be16  x_len;          /* bytes for X axis */
+        __be16  y_len;          /* bytes for Y axis */
+        u8      data[];
+} __attribute__ ((packed));
+static unsigned char nexio_ack_pkt[2] = { 0xaa, 0x02 };
+static unsigned char nexio_init_pkt[4] = { 0x82, 0x04, 0x0a, 0x0f };
+static void nexio_ack_complete(struct urb *urb)
+{
+}
+static int nexio_init(struct usbtouch_usb *usbtouch)
+{
+        struct usb_device *dev = interface_to_usbdev(usbtouch->interface);
+        struct usb_host_interface *interface = usbtouch->interface->cur_altsetting;
+        struct nexio_priv *priv;
+        int ret = -ENOMEM;
+        int actual_len, i;
+        unsigned char *buf;
+        char *firmware_ver = NULL, *device_name = NULL;
+        int input_ep = 0, output_ep = 0;
+        /* find first input and output endpoint */
+        for (i = 0; i < interface->desc.bNumEndpoints; i++) {
+                if (!input_ep &&
+                    usb_endpoint_dir_in(&interface->endpoint[i].desc))
+                        input_ep = interface->endpoint[i].desc.bEndpointAddress;
+                if (!output_ep &&
+                    usb_endpoint_dir_out(&interface->endpoint[i].desc))
+                        output_ep = interface->endpoint[i].desc.bEndpointAddress;
+        }
+        if (!input_ep || !output_ep)
+                return -ENXIO;
+        buf = kmalloc(NEXIO_BUFSIZE, GFP_KERNEL);
+        if (!buf)
+                goto out_buf;
+        /* two empty reads */
+        for (i = 0; i < 2; i++) {
+                ret = usb_bulk_msg(dev, usb_rcvbulkpipe(dev, input_ep),
+                                   buf, NEXIO_BUFSIZE, &actual_len,
+                                   NEXIO_TIMEOUT);
+                if (ret < 0)
+                        goto out_buf;
+        }
+        /* send init command */
+        memcpy(buf, nexio_init_pkt, sizeof(nexio_init_pkt));
+        ret = usb_bulk_msg(dev, usb_sndbulkpipe(dev, output_ep),
+                           buf, sizeof(nexio_init_pkt), &actual_len,
+                           NEXIO_TIMEOUT);
+        if (ret < 0)
+                goto out_buf;
+        /* read replies */
+        for (i = 0; i < 3; i++) {
+                memset(buf, 0, NEXIO_BUFSIZE);
+                ret = usb_bulk_msg(dev, usb_rcvbulkpipe(dev, input_ep),
+                                   buf, NEXIO_BUFSIZE, &actual_len,
+                                   NEXIO_TIMEOUT);
+                if (ret < 0 || actual_len < 1 || buf[1] != actual_len)
+                        continue;
+                switch (buf[0]) {
+                case 0x83:      /* firmware version */
+                        if (!firmware_ver)
+                                firmware_ver = kstrdup(&buf[2], GFP_KERNEL);
+                        break;
+                case 0x84:      /* device name */
+                        if (!device_name)
+                                device_name = kstrdup(&buf[2], GFP_KERNEL);
+                        break;
+                }
+        }
+        printk(KERN_INFO "Nexio device: %s, firmware version: %s\n",
+               device_name, firmware_ver);
+        kfree(firmware_ver);
+        kfree(device_name);
+        /* prepare ACK URB */
+        ret = -ENOMEM;
+        usbtouch->priv = kmalloc(sizeof(struct nexio_priv), GFP_KERNEL);
+        if (!usbtouch->priv)
+                goto out_buf;
+        priv = usbtouch->priv;
+        priv->ack_buf = kmalloc(sizeof(nexio_ack_pkt), GFP_KERNEL);
+        if (!priv->ack_buf)
+                goto err_priv;
+        memcpy(priv->ack_buf, nexio_ack_pkt, sizeof(nexio_ack_pkt));
+        priv->ack = usb_alloc_urb(0, GFP_KERNEL);
+        if (!priv->ack) {
+                dbg("%s - usb_alloc_urb failed: usbtouch->ack", __func__);
+                goto err_ack_buf;
+        }
+        usb_fill_bulk_urb(priv->ack, dev, usb_sndbulkpipe(dev, output_ep),
+                          priv->ack_buf, sizeof(nexio_ack_pkt),
+                          nexio_ack_complete, usbtouch);
+        ret = 0;
+        goto out_buf;
+err_ack_buf:
+        kfree(priv->ack_buf);
+err_priv:
+        kfree(priv);
+out_buf:
+        kfree(buf);
+        return ret;
+}
+static void nexio_exit(struct usbtouch_usb *usbtouch)
+{
+        struct nexio_priv *priv = usbtouch->priv;
+        usb_kill_urb(priv->ack);
+        usb_free_urb(priv->ack);
+        kfree(priv->ack_buf);
+        kfree(priv);
+}
+static int nexio_read_data(struct usbtouch_usb *usbtouch, unsigned char *pkt)
+{
+        int x, y, begin_x, begin_y, end_x, end_y, w, h, ret;
+        struct nexio_touch_packet *packet = (void *) pkt;
+        struct nexio_priv *priv = usbtouch->priv;
+        /* got touch data? */
+        if ((pkt[0] & 0xe0) != 0xe0)
+                return 0;
+        /* send ACK */
+        ret = usb_submit_urb(priv->ack, GFP_ATOMIC);
+        if (!usbtouch->type->max_xc) {
+                usbtouch->type->max_xc = 2 * be16_to_cpu(packet->x_len);
+                input_set_abs_params(usbtouch->input, ABS_X, 0,
+                                     2 * be16_to_cpu(packet->x_len), 0, 0);
+                usbtouch->type->max_yc = 2 * be16_to_cpu(packet->y_len);
+                input_set_abs_params(usbtouch->input, ABS_Y, 0,
+                                     2 * be16_to_cpu(packet->y_len), 0, 0);
+        }
+        /*
+         * The device reports state of IR sensors on X and Y axes.
+         * Each byte represents "darkness" percentage (0-100) of one element.
+         * 17" touchscreen reports only 64 x 52 bytes so the resolution is low.
+         * This also means that there's a limited multi-touch capability but
+         * it's disabled (and untested) here as there's no X driver for that.
+         */
+        begin_x = end_x = begin_y = end_y = -1;
+        for (x = 0; x < be16_to_cpu(packet->x_len); x++) {
+                if (begin_x == -1 && packet->data[x] > NEXIO_THRESHOLD) {
+                        begin_x = x;
+                        continue;
+                }
+                if (end_x == -1 && begin_x != -1 && packet->data[x] < NEXIO_THRESHOLD) {
+                        end_x = x - 1;
+                        for (y = be16_to_cpu(packet->x_len);
+                             y < be16_to_cpu(packet->data_len); y++) {
+                                if (begin_y == -1 && packet->data[y] > NEXIO_THRESHOLD) {
+                                        begin_y = y - be16_to_cpu(packet->x_len);
+                                        continue;
+                                }
+                                if (end_y == -1 &&
+                                    begin_y != -1 && packet->data[y] < NEXIO_THRESHOLD) {
+                                        end_y = y - 1 - be16_to_cpu(packet->x_len);
+                                        w = end_x - begin_x;
+                                        h = end_y - begin_y;
+#if 0
+                                        /* multi-touch */
+                                        input_report_abs(usbtouch->input,
+                                                    ABS_MT_TOUCH_MAJOR, max(w,h));
+                                        input_report_abs(usbtouch->input,
+                                                    ABS_MT_TOUCH_MINOR, min(x,h));
+                                        input_report_abs(usbtouch->input,
+                                                    ABS_MT_POSITION_X, 2*begin_x+w);
+                                        input_report_abs(usbtouch->input,
+                                                    ABS_MT_POSITION_Y, 2*begin_y+h);
+                                        input_report_abs(usbtouch->input,
+                                                    ABS_MT_ORIENTATION, w > h);
+                                        input_mt_sync(usbtouch->input);
+#endif
+                                        /* single touch */
+                                        usbtouch->x = 2 * begin_x + w;
+                                        usbtouch->y = 2 * begin_y + h;
+                                        usbtouch->touch = packet->flags & 0x01;
+                                        begin_y = end_y = -1;
+                                        return 1;
+                                }
+                        }
+                        begin_x = end_x = -1;
+                }
+        }
+        return 0;
+}
+#endif
+/*****************************************************************************
 * the different device descriptors
 */
 #ifdef MULTI_PACKET
@@ -873,6 +1110,16 @@ static struct usbtouch_device_info usbtouch_dev_info[] = {
                .read_data      = tc5uh_read_data,
        },
 #endif
+#ifdef CONFIG_TOUCHSCREEN_USB_NEXIO
+        [DEVTYPE_NEXIO] = {
+                .rept_size      = 128,
+                .irq_always     = true,
+                .read_data      = nexio_read_data,
+                .init           = nexio_init,
+                .exit           = nexio_exit,
+        },
+#endif
 };
@@ -998,6 +1245,7 @@ static void usbtouch_irq(struct urb *urb)
        case -ECONNRESET:
        case -ENOENT:
        case -ESHUTDOWN:
+        case -EPIPE:
                /* this urb is terminated, clean up */
                dbg("%s - urb shutting down with status: %d",
                    __func__, urb->status);
@@ -1021,7 +1269,7 @@ static int usbtouch_open(struct input_dev *input)
 {
        struct usbtouch_usb *usbtouch = input_get_drvdata(input);
-        usbtouch->irq->dev = usbtouch->udev;
+        usbtouch->irq->dev = interface_to_usbdev(usbtouch->interface);
        if (!usbtouch->type->irq_always) {
                if (usb_submit_urb(usbtouch->irq, GFP_KERNEL))
@@ -1048,13 +1296,23 @@ static void usbtouch_free_buffers(struct usb_device *udev,
        kfree(usbtouch->buffer);
 }
+static struct usb_endpoint_descriptor *
+usbtouch_get_input_endpoint(struct usb_host_interface *interface)
+{
+        int i;
+        for (i = 0; i < interface->desc.bNumEndpoints; i++)
+                if (usb_endpoint_dir_in(&interface->endpoint[i].desc))
+                        return &interface->endpoint[i].desc;
+        return NULL;
+}
 static int usbtouch_probe(struct usb_interface *intf,
                          const struct usb_device_id *id)
 {
        struct usbtouch_usb *usbtouch;
        struct input_dev *input_dev;
-        struct usb_host_interface *interface;
        struct usb_endpoint_descriptor *endpoint;
        struct usb_device *udev = interface_to_usbdev(intf);
        struct usbtouch_device_info *type;
@@ -1064,8 +1322,9 @@ static int usbtouch_probe(struct usb_interface *intf,
        if (id->driver_info == DEVTYPE_IGNORE)
                return -ENODEV;
-        interface = intf->cur_altsetting;
+        endpoint = usbtouch_get_input_endpoint(intf->cur_altsetting);
-        endpoint = &interface->endpoint[0].desc;
+        if (!endpoint)
+                return -ENXIO;
        usbtouch = kzalloc(sizeof(struct usbtouch_usb), GFP_KERNEL);
        input_dev = input_allocate_device();
@@ -1094,7 +1353,7 @@ static int usbtouch_probe(struct usb_interface *intf,
                goto out_free_buffers;
        }
-        usbtouch->udev = udev;
+        usbtouch->interface = intf;
        usbtouch->input = input_dev;
        if (udev->manufacturer)
@@ -1133,12 +1392,18 @@ static int usbtouch_probe(struct usb_interface *intf,
                input_set_abs_params(input_dev, ABS_PRESSURE, type->min_press,
                                     type->max_press, 0, 0);
-        usb_fill_int_urb(usbtouch->irq, usbtouch->udev,
+        if (usb_endpoint_type(endpoint) == USB_ENDPOINT_XFER_INT)
-                         usb_rcvintpipe(usbtouch->udev, endpoint->bEndpointAddress),
+                usb_fill_int_urb(usbtouch->irq, udev,
+                         usb_rcvintpipe(udev, endpoint->bEndpointAddress),
                         usbtouch->data, type->rept_size,
                         usbtouch_irq, usbtouch, endpoint->bInterval);
+        else
+                usb_fill_bulk_urb(usbtouch->irq, udev,
+                         usb_rcvbulkpipe(udev, endpoint->bEndpointAddress),
+                         usbtouch->data, type->rept_size,
+                         usbtouch_irq, usbtouch);
-        usbtouch->irq->dev = usbtouch->udev;
+        usbtouch->irq->dev = udev;
        usbtouch->irq->transfer_dma = usbtouch->data_dma;
        usbtouch->irq->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
@@ -1147,23 +1412,37 @@ static int usbtouch_probe(struct usb_interface *intf,
                err = type->init(usbtouch);
                if (err) {
                        dbg("%s - type->init() failed, err: %d", __func__, err);
-                        goto out_free_buffers;
+                        goto out_free_urb;
                }
        }
        err = input_register_device(usbtouch->input);
        if (err) {
                dbg("%s - input_register_device failed, err: %d", __func__, err);
-                goto out_free_buffers;
+                goto out_do_exit;
        }
        usb_set_intfdata(intf, usbtouch);
-        if (usbtouch->type->irq_always)
+        if (usbtouch->type->irq_always) {
-                usb_submit_urb(usbtouch->irq, GFP_KERNEL);
+                err = usb_submit_urb(usbtouch->irq, GFP_KERNEL);
+                if (err) {
+                        err("%s - usb_submit_urb failed with result: %d",
+                            __func__, err);
+                        goto out_unregister_input;
+                }
+        }
        return 0;
+out_unregister_input:
+        input_unregister_device(input_dev);
+        input_dev = NULL;
+out_do_exit:
+        if (type->exit)
+                type->exit(usbtouch);
+out_free_urb:
+        usb_free_urb(usbtouch->irq);
 out_free_buffers:
        usbtouch_free_buffers(udev, usbtouch);
 out_free:
@@ -1186,6 +1465,8 @@ static void usbtouch_disconnect(struct usb_interface *intf)
        /* this will stop IO via close */
        input_unregister_device(usbtouch->input);
        usb_free_urb(usbtouch->irq);
+        if (usbtouch->type->exit)
+                usbtouch->type->exit(usbtouch);
        usbtouch_free_buffers(interface_to_usbdev(intf), usbtouch);
        kfree(usbtouch);
 }
diff --git a/drivers/input/touchscreen/zylonite-wm97xx.c b/drivers/input/touchscreen/zylonite-wm97xx.c
index eca54dbdf49..04884986764 100644
--- a/drivers/input/touchscreen/zylonite-wm97xx.c
+++ b/drivers/input/touchscreen/zylonite-wm97xx.c
@@ -118,6 +118,9 @@ static int wm97xx_acc_pen_down(struct wm97xx *wm)
                if (pressure)
                        p = MODR;
+                dev_dbg(wm->dev, "Raw coordinates: x=%x, y=%x, p=%x\n",
+                        x, y, p);
                /* are samples valid */
                if ((x & WM97XX_ADCSRC_MASK) != WM97XX_ADCSEL_X ||
                    (y & WM97XX_ADCSRC_MASK) != WM97XX_ADCSEL_Y ||
diff --git a/drivers/input/xen-kbdfront.c b/drivers/input/xen-kbdfront.c
index c721c0a23eb..d30436fee47 100644
--- a/drivers/input/xen-kbdfront.c
+++ b/drivers/input/xen-kbdfront.c
@@ -321,7 +321,7 @@ InitWait:
        }
 }
-static struct xenbus_device_id xenkbd_ids[] = {
+static const struct xenbus_device_id xenkbd_ids[] = {
        { "vkbd" },
        { "" }
 };
diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig
index 3d906833948..fd85bde283a 100644
--- a/drivers/macintosh/Kconfig
+++ b/drivers/macintosh/Kconfig
@@ -171,8 +171,8 @@ config INPUT_ADBHID
          If unsure, say Y.
 config MAC_EMUMOUSEBTN
-        bool "Support for mouse button 2+3 emulation"
+        tristate "Support for mouse button 2+3 emulation"
-        select INPUT
+        depends on SYSCTL && INPUT
        help
          This provides generic support for emulating the 2nd and 3rd mouse
          button with keypresses.  If you say Y here, the emulation is still
@@ -184,6 +184,9 @@ config MAC_EMUMOUSEBTN
          If you have an Apple machine with a 1-button mouse, say Y here.
+          To compile this driver as a module, choose M here: the
+          module will be called mac_hid.
 config THERM_WINDTUNNEL
        tristate "Support for thermal management on Windtunnel G4s"
        depends on I2C && I2C_POWERMAC && PPC_PMAC && !PPC_PMAC64
diff --git a/drivers/macintosh/mac_hid.c b/drivers/macintosh/mac_hid.c
index 7b4ef5bb556..e943d2a2925 100644
--- a/drivers/macintosh/mac_hid.c
+++ b/drivers/macintosh/mac_hid.c
@@ -13,17 +13,197 @@
 #include <linux/sysctl.h>
 #include <linux/input.h>
 #include <linux/module.h>
-#include <linux/kbd_kern.h>
+MODULE_LICENSE("GPL");
-static struct input_dev *emumousebtn;
-static int emumousebtn_input_register(void);
 static int mouse_emulate_buttons;
 static int mouse_button2_keycode = KEY_RIGHTCTRL;       /* right control key */
 static int mouse_button3_keycode = KEY_RIGHTALT;        /* right option key */
-static int mouse_last_keycode;
-#if defined(CONFIG_SYSCTL)
+static struct input_dev *mac_hid_emumouse_dev;
+static int mac_hid_create_emumouse(void)
+{
+        static struct lock_class_key mac_hid_emumouse_dev_event_class;
+        static struct lock_class_key mac_hid_emumouse_dev_mutex_class;
+        int err;
+        mac_hid_emumouse_dev = input_allocate_device();
+        if (!mac_hid_emumouse_dev)
+                return -ENOMEM;
+        lockdep_set_class(&mac_hid_emumouse_dev->event_lock,
+                          &mac_hid_emumouse_dev_event_class);
+        lockdep_set_class(&mac_hid_emumouse_dev->mutex,
+                          &mac_hid_emumouse_dev_mutex_class);
+        mac_hid_emumouse_dev->name = "Macintosh mouse button emulation";
+        mac_hid_emumouse_dev->id.bustype = BUS_ADB;
+        mac_hid_emumouse_dev->id.vendor = 0x0001;
+        mac_hid_emumouse_dev->id.product = 0x0001;
+        mac_hid_emumouse_dev->id.version = 0x0100;
+        mac_hid_emumouse_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL);
+        mac_hid_emumouse_dev->keybit[BIT_WORD(BTN_MOUSE)] =
+                BIT_MASK(BTN_LEFT) | BIT_MASK(BTN_MIDDLE) | BIT_MASK(BTN_RIGHT);
+        mac_hid_emumouse_dev->relbit[0] = BIT_MASK(REL_X) | BIT_MASK(REL_Y);
+        err = input_register_device(mac_hid_emumouse_dev);
+        if (err) {
+                input_free_device(mac_hid_emumouse_dev);
+                mac_hid_emumouse_dev = NULL;
+                return err;
+        }
+        return 0;
+}
+static void mac_hid_destroy_emumouse(void)
+{
+        input_unregister_device(mac_hid_emumouse_dev);
+        mac_hid_emumouse_dev = NULL;
+}
+static bool mac_hid_emumouse_filter(struct input_handle *handle,
+                                    unsigned int type, unsigned int code,
+                                    int value)
+{
+        unsigned int btn;
+        if (type != EV_KEY)
+                return false;
+        if (code == mouse_button2_keycode)
+                btn = BTN_MIDDLE;
+        else if (code == mouse_button3_keycode)
+                btn = BTN_RIGHT;
+        else
+                return false;
+        input_report_key(mac_hid_emumouse_dev, btn, value);
+        input_sync(mac_hid_emumouse_dev);
+        return true;
+}
+static int mac_hid_emumouse_connect(struct input_handler *handler,
+                                    struct input_dev *dev,
+                                    const struct input_device_id *id)
+{
+        struct input_handle *handle;
+        int error;
+        /* Don't bind to ourselves */
+        if (dev == mac_hid_emumouse_dev)
+                return -ENODEV;
+        handle = kzalloc(sizeof(struct input_handle), GFP_KERNEL);
+        if (!handle)
+                return -ENOMEM;
+        handle->dev = dev;
+        handle->handler = handler;
+        handle->name = "mac-button-emul";
+        error = input_register_handle(handle);
+        if (error) {
+                printk(KERN_ERR
+                        "mac_hid: Failed to register button emulation handle, "
+                        "error %d\n", error);
+                goto err_free;
+        }
+        error = input_open_device(handle);
+        if (error) {
+                printk(KERN_ERR
+                        "mac_hid: Failed to open input device, error %d\n",
+                        error);
+                goto err_unregister;
+        }
+        return 0;
+ err_unregister:
+        input_unregister_handle(handle);
+ err_free:
+        kfree(handle);
+        return error;
+}
+static void mac_hid_emumouse_disconnect(struct input_handle *handle)
+{
+        input_close_device(handle);
+        input_unregister_handle(handle);
+        kfree(handle);
+}
+static const struct input_device_id mac_hid_emumouse_ids[] = {
+        {
+                .flags = INPUT_DEVICE_ID_MATCH_EVBIT,
+                .evbit = { BIT_MASK(EV_KEY) },
+        },
+        { },
+};
+MODULE_DEVICE_TABLE(input, mac_hid_emumouse_ids);
+static struct input_handler mac_hid_emumouse_handler = {
+        .filter         = mac_hid_emumouse_filter,
+        .connect        = mac_hid_emumouse_connect,
+        .disconnect     = mac_hid_emumouse_disconnect,
+        .name           = "mac-button-emul",
+        .id_table       = mac_hid_emumouse_ids,
+};
+static int mac_hid_start_emulation(void)
+{
+        int err;
+        err = mac_hid_create_emumouse();
+        if (err)
+                return err;
+        err = input_register_handler(&mac_hid_emumouse_handler);
+        if (err) {
+                mac_hid_destroy_emumouse();
+                return err;
+        }
+        return 0;
+}
+static void mac_hid_stop_emulation(void)
+{
+        input_unregister_handler(&mac_hid_emumouse_handler);
+        mac_hid_destroy_emumouse();
+}
+static int mac_hid_toggle_emumouse(ctl_table *table, int write,
+                                   void __user *buffer, size_t *lenp,
+                                   loff_t *ppos)
+{
+        int *valp = table->data;
+        int old_val = *valp;
+        int rc;
+        rc = proc_dointvec(table, write, buffer, lenp, ppos);
+        if (rc == 0 && write && *valp != old_val) {
+                if (*valp == 1)
+                        rc = mac_hid_start_emulation();
+                else if (*valp == 0)
+                        mac_hid_stop_emulation();
+                else
+                        rc = -EINVAL;
+        }
+        /* Restore the old value in case of error */
+        if (rc)
+                *valp = old_val;
+        return rc;
+}
 /* file(s) in /proc/sys/dev/mac_hid */
 static ctl_table mac_hid_files[] = {
        {
@@ -31,7 +211,7 @@ static ctl_table mac_hid_files[] = {
                .data           = &mouse_emulate_buttons,
                .maxlen         = sizeof(int),
                .mode           = 0644,
-                .proc_handler   = proc_dointvec,
+                .proc_handler   = mac_hid_toggle_emumouse,
        },
        {
                .procname       = "mouse_button2_keycode",
@@ -74,75 +254,21 @@ static ctl_table mac_hid_root_dir[] = {
 static struct ctl_table_header *mac_hid_sysctl_header;
-#endif /* endif CONFIG_SYSCTL */
+static int __init mac_hid_init(void)
-int mac_hid_mouse_emulate_buttons(int caller, unsigned int keycode, int down)
-{
-        switch (caller) {
-        case 1:
-                /* Called from keyboard.c */
-                if (mouse_emulate_buttons
-                    && (keycode == mouse_button2_keycode
-                        || keycode == mouse_button3_keycode)) {
-                        if (mouse_emulate_buttons == 1) {
-                                input_report_key(emumousebtn,
-                                                 keycode == mouse_button2_keycode ? BTN_MIDDLE : BTN_RIGHT,
-                                                 down);
-                                input_sync(emumousebtn);
-                                return 1;
-                        }
-                        mouse_last_keycode = down ? keycode : 0;
-                }
-                break;
-        }
-        return 0;
-}
-static struct lock_class_key emumousebtn_event_class;
-static struct lock_class_key emumousebtn_mutex_class;
-static int emumousebtn_input_register(void)
 {
-        int ret;
+        mac_hid_sysctl_header = register_sysctl_table(mac_hid_root_dir);
+        if (!mac_hid_sysctl_header)
-        emumousebtn = input_allocate_device();
-        if (!emumousebtn)
                return -ENOMEM;
-        lockdep_set_class(&emumousebtn->event_lock, &emumousebtn_event_class);
+        return 0;
-        lockdep_set_class(&emumousebtn->mutex, &emumousebtn_mutex_class);
-        emumousebtn->name = "Macintosh mouse button emulation";
-        emumousebtn->id.bustype = BUS_ADB;
-        emumousebtn->id.vendor = 0x0001;
-        emumousebtn->id.product = 0x0001;
-        emumousebtn->id.version = 0x0100;
-        emumousebtn->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL);
-        emumousebtn->keybit[BIT_WORD(BTN_MOUSE)] = BIT_MASK(BTN_LEFT) |
-                BIT_MASK(BTN_MIDDLE) | BIT_MASK(BTN_RIGHT);
-        emumousebtn->relbit[0] = BIT_MASK(REL_X) | BIT_MASK(REL_Y);
-        ret = input_register_device(emumousebtn);
-        if (ret)
-                input_free_device(emumousebtn);
-        return ret;
 }
+module_init(mac_hid_init);
-static int __init mac_hid_init(void)
+static void __exit mac_hid_exit(void)
 {
-        int err;
+        unregister_sysctl_table(mac_hid_sysctl_header);
-        err = emumousebtn_input_register();
-        if (err)
-                return err;
-#if defined(CONFIG_SYSCTL)
-        mac_hid_sysctl_header = register_sysctl_table(mac_hid_root_dir);
-#endif /* CONFIG_SYSCTL */
-        return 0;
+        if (mouse_emulate_buttons)
+                mac_hid_stop_emulation();
 }
+module_exit(mac_hid_exit);
-device_initcall(mac_hid_init);
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index c0c73913833..2e7a3bf1382 100644
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -354,7 +354,7 @@ static struct pci_platform_pm_ops acpi_pci_platform_pm = {
 static int acpi_pci_find_device(struct device *dev, acpi_handle *handle)
 {
        struct pci_dev * pci_dev;
-        acpi_integer    addr;
+        u64     addr;
        pci_dev = to_pci_dev(dev);
        /* Please ref to ACPI spec for the syntax of _ADR */
diff --git a/drivers/platform/x86/toshiba_bluetooth.c b/drivers/platform/x86/toshiba_bluetooth.c
index a350418e87e..94406861191 100644
--- a/drivers/platform/x86/toshiba_bluetooth.c
+++ b/drivers/platform/x86/toshiba_bluetooth.c
@@ -57,7 +57,7 @@ static struct acpi_driver toshiba_bt_rfkill_driver = {
 static int toshiba_bluetooth_enable(acpi_handle handle)
 {
        acpi_status res1, res2;
-        acpi_integer result;
+        u64 result;
        /*
         * Query ACPI to verify RFKill switch is set to 'on'.
@@ -95,7 +95,7 @@ static int toshiba_bt_resume(struct acpi_device *device)
 static int toshiba_bt_rfkill_add(struct acpi_device *device)
 {
        acpi_status status;
-        acpi_integer bt_present;
+        u64 bt_present;
        int result = -ENODEV;
        /*
diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c
index b104302fea0..09e9918c69c 100644
--- a/drivers/platform/x86/wmi.c
+++ b/drivers/platform/x86/wmi.c
@@ -796,7 +796,7 @@ static __init acpi_status parse_wdg(acpi_handle handle)
 */
 static acpi_status
 acpi_wmi_ec_space_handler(u32 function, acpi_physical_address address,
-                      u32 bits, acpi_integer * value,
+                      u32 bits, u64 *value,
                      void *handler_context, void *region_context)
 {
        int result = 0, i = 0;
@@ -813,7 +813,7 @@ acpi_wmi_ec_space_handler(u32 function, acpi_physical_address address,
        if (function == ACPI_READ) {
                result = ec_read(address, &temp);
-                (*value) |= ((acpi_integer)temp) << i;
+                (*value) |= ((u64)temp) << i;
        } else {
                temp = 0xff & ((*value) >> i);
                result = ec_write(address, temp);