Merge branch 'next-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerp...

Merge miscellaneous bits from benh. Fix a minor conflict with
OpalMessageType changing names to opal_msg_type.

diff --cc arch/powerpc/include/asm/opal.h
index 0ef0fd660ac63a30d2887ea2169230722e8b9c99,4ea21ea6a999f87f2e85155d0df2d5b67fc4122b..c08de77f398af7b835412dc73c97758b4b20c70e
--- 1/arch/powerpc/include/asm/opal.h
--- 2/arch/powerpc/include/asm/opal.h
+++ b/arch/powerpc/include/asm/opal.h
@@@ -208,8 -946,10 +208,10 @@@ extern void hvc_opal_init_early(void)
  extern int opal_notifier_register(struct notifier_block *nb);
  extern int opal_notifier_unregister(struct notifier_block *nb);
  
 -extern int opal_message_notifier_register(enum OpalMessageType msg_type,
 +extern int opal_message_notifier_register(enum opal_msg_type msg_type,
                                                struct notifier_block *nb);
 -extern int opal_message_notifier_unregister(enum OpalMessageType msg_type,
++extern int opal_message_notifier_unregister(enum opal_msg_type msg_type,
+                                           struct notifier_block *nb);
  extern void opal_notifier_enable(void);
  extern void opal_notifier_disable(void);
  extern void opal_notifier_update_evt(uint64_t evt_mask, uint64_t evt_val);

diff --cc arch/powerpc/platforms/powernv/opal.c
index 142a08a61bd1bb6ae25c519aa00aa6bdafebee49,8b3834a095f7033256ae372712f580b72833e58a..d403b2b0862675d0321ad3014401f4baac1fee53
--- 1/arch/powerpc/platforms/powernv/opal.c
--- 2/arch/powerpc/platforms/powernv/opal.c
+++ b/arch/powerpc/platforms/powernv/opal.c
@@@ -302,16 -305,11 +305,11 @@@ void opal_notifier_disable(void
   * Opal message notifier based on message type. Allow subscribers to get
   * notified for specific messgae type.
   */
 -int opal_message_notifier_register(enum OpalMessageType msg_type,
 +int opal_message_notifier_register(enum opal_msg_type msg_type,
                                        struct notifier_block *nb)
  {
-       if (!nb) {
-               pr_warning("%s: Invalid argument (%p)\n",
-                          __func__, nb);
-               return -EINVAL;
-       }
-       if (msg_type > OPAL_MSG_TYPE_MAX) {
-               pr_warning("%s: Invalid message type argument (%d)\n",
+       if (!nb || msg_type >= OPAL_MSG_TYPE_MAX) {
+               pr_warning("%s: Invalid arguments, msg_type:%d\n",
                           __func__, msg_type);
                return -EINVAL;
        }
@@@ -319,6 -318,13 +318,13 @@@
                                &opal_msg_notifier_head[msg_type], nb);
  }
  
 -int opal_message_notifier_unregister(enum OpalMessageType msg_type,
++int opal_message_notifier_unregister(enum opal_msg_type msg_type,
+                                    struct notifier_block *nb)
+ {
+       return atomic_notifier_chain_unregister(
+                       &opal_msg_notifier_head[msg_type], nb);
+ }
+ 
  static void opal_message_do_notify(uint32_t msg_type, void *msg)
  {
        /* notify subscribers */