Merge branch 'next' into resolution

[mirror_ubuntu-jammy-kernel.git] / include / linux / extcon.h

diff --git a/include/linux/extcon.h b/include/linux/extcon.h
index 5c35f9d1822c96ef962c6b04e87e1ccbb94387d8..2b9f15156115f0cf134d2ae70d56619dcd35ede5 100644 (file)
--- a/include/linux/extcon.h
+++ b/include/linux/extcon.h
@@ -249,7 +249,6 @@ extern int extcon_set_state(struct extcon_dev *edev, unsigned int id,
                                   bool cable_state);
 extern int extcon_set_state_sync(struct extcon_dev *edev, unsigned int id,
                                bool cable_state);
-
 /*
  * Synchronize the state and property data for a specific external connector.
  */
@@ -359,10 +358,27 @@ static inline int extcon_set_state_sync(struct extcon_dev *edev, unsigned int id
 }
 
 static inline int extcon_sync(struct extcon_dev *edev, unsigned int id)
+<<<<<<< HEAD
+=======
+{
+       return 0;
+}
+
+static inline int extcon_get_property(struct extcon_dev *edev, unsigned int id,
+                                       unsigned int prop,
+                                       union extcon_property_value *prop_val)
+{
+       return 0;
+}
+static inline int extcon_set_property(struct extcon_dev *edev, unsigned int id,
+                                       unsigned int prop,
+                                       union extcon_property_value prop_val)
+>>>>>>> next
 {
        return 0;
 }
 
+<<<<<<< HEAD
 static inline int extcon_get_property(struct extcon_dev *edev, unsigned int id,
                                        unsigned int prop,
                                        union extcon_property_value *prop_val)
@@ -371,24 +387,36 @@ static inline int extcon_get_property(struct extcon_dev *edev, unsigned int id,
 }
 static inline int extcon_set_property(struct extcon_dev *edev, unsigned int id,
                                        unsigned int prop,
+=======
+static inline int extcon_set_property_sync(struct extcon_dev *edev,
+                                       unsigned int id, unsigned int prop,
+>>>>>>> next
                                        union extcon_property_value prop_val)
 {
        return 0;
 }
 
+<<<<<<< HEAD
 static inline int extcon_set_property_sync(struct extcon_dev *edev,
                                        unsigned int id, unsigned int prop,
                                        union extcon_property_value prop_val)
+=======
+static inline int extcon_get_property_capability(struct extcon_dev *edev,
+                                       unsigned int id, unsigned int prop)
+>>>>>>> next
 {
        return 0;
 }
 
+<<<<<<< HEAD
 static inline int extcon_get_property_capability(struct extcon_dev *edev,
                                        unsigned int id, unsigned int prop)
 {
        return 0;
 }
 
+=======
+>>>>>>> next
 static inline int extcon_set_property_capability(struct extcon_dev *edev,
                                        unsigned int id, unsigned int prop)
 {