Merge tag 'staging-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[sfrench/cifs-2.6.git] / include / linux / counter.h

diff --git a/include/linux/counter.h b/include/linux/counter.h
index a061cdcdef7c582017758991041e41fe9d7da2b8..9dbd5df4cd34de566e9ee039eb7766dae4712065 100644 (file)
--- a/include/linux/counter.h
+++ b/include/linux/counter.h
@@ -290,53 +290,22 @@ struct counter_device_state {
        const struct attribute_group **groups;
 };
 
-/**
- * struct counter_signal_read_value - Opaque Signal read value
- * @buf:       string representation of Signal read value
- * @len:       length of string in @buf
- */
-struct counter_signal_read_value {
-       char *buf;
-       size_t len;
-};
-
-/**
- * struct counter_count_read_value - Opaque Count read value
- * @buf:       string representation of Count read value
- * @len:       length of string in @buf
- */
-struct counter_count_read_value {
-       char *buf;
-       size_t len;
-};
-
-/**
- * struct counter_count_write_value - Opaque Count write value
- * @buf:       string representation of Count write value
- */
-struct counter_count_write_value {
-       const char *buf;
+enum counter_signal_value {
+       COUNTER_SIGNAL_LOW = 0,
+       COUNTER_SIGNAL_HIGH
 };
 
 /**
  * struct counter_ops - Callbacks from driver
  * @signal_read:       optional read callback for Signal attribute. The read
  *                     value of the respective Signal should be passed back via
- *                     the val parameter. val points to an opaque type which
- *                     should be set only by calling the
- *                     counter_signal_read_value_set function from within the
- *                     signal_read callback.
+ *                     the val parameter.
  * @count_read:                optional read callback for Count attribute. The read
  *                     value of the respective Count should be passed back via
- *                     the val parameter. val points to an opaque type which
- *                     should be set only by calling the
- *                     counter_count_read_value_set function from within the
- *                     count_read callback.
+ *                     the val parameter.
  * @count_write:       optional write callback for Count attribute. The write
  *                     value for the respective Count is passed in via the val
- *                     parameter. val points to an opaque type which should be
- *                     accessed only by calling the
- *                     counter_count_write_value_get function.
+ *                     parameter.
  * @function_get:      function to get the current count function mode. Returns
  *                     0 on success and negative error code on error. The index
  *                     of the respective Count's returned function mode should
@@ -346,7 +315,7 @@ struct counter_count_write_value {
  *                     Count's functions_list array.
  * @action_get:                function to get the current action mode. Returns 0 on
  *                     success and negative error code on error. The index of
- *                     the respective Signal's returned action mode should be
+ *                     the respective Synapse's returned action mode should be
  *                     passed back via the action parameter.
  * @action_set:                function to set the action mode. action is the index of
  *                     the requested action mode from the respective Synapse's
@@ -355,13 +324,11 @@ struct counter_count_write_value {
 struct counter_ops {
        int (*signal_read)(struct counter_device *counter,
                           struct counter_signal *signal,
-                          struct counter_signal_read_value *val);
+                          enum counter_signal_value *val);
        int (*count_read)(struct counter_device *counter,
-                         struct counter_count *count,
-                         struct counter_count_read_value *val);
+                         struct counter_count *count, unsigned long *val);
        int (*count_write)(struct counter_device *counter,
-                          struct counter_count *count,
-                          struct counter_count_write_value *val);
+                          struct counter_count *count, unsigned long val);
        int (*function_get)(struct counter_device *counter,
                            struct counter_count *count, size_t *function);
        int (*function_set)(struct counter_device *counter,
@@ -477,29 +444,6 @@ struct counter_device {
        void *priv;
 };
 
-enum counter_signal_level {
-       COUNTER_SIGNAL_LEVEL_LOW = 0,
-       COUNTER_SIGNAL_LEVEL_HIGH
-};
-
-enum counter_signal_value_type {
-       COUNTER_SIGNAL_LEVEL = 0
-};
-
-enum counter_count_value_type {
-       COUNTER_COUNT_POSITION = 0,
-};
-
-void counter_signal_read_value_set(struct counter_signal_read_value *const val,
-                                  const enum counter_signal_value_type type,
-                                  void *const data);
-void counter_count_read_value_set(struct counter_count_read_value *const val,
-                                 const enum counter_count_value_type type,
-                                 void *const data);
-int counter_count_write_value_get(void *const data,
-                                 const enum counter_count_value_type type,
-                                 const struct counter_count_write_value *const val);
-
 int counter_register(struct counter_device *const counter);
 void counter_unregister(struct counter_device *const counter);
 int devm_counter_register(struct device *dev,