HID: i2c-hid: use "struct i2c_hid" as argument in most calls

[platform/kernel/linux-starfive.git] / block / bfq-iosched.h

diff --git a/block/bfq-iosched.h b/block/bfq-iosched.h
index a73488e..07288b9 100644 (file)
--- a/block/bfq-iosched.h
+++ b/block/bfq-iosched.h
@@ -25,7 +25,7 @@
 #define BFQ_DEFAULT_GRP_IOPRIO 0
 #define BFQ_DEFAULT_GRP_CLASS  IOPRIO_CLASS_BE
 
-#define MAX_PID_STR_LENGTH 12
+#define MAX_BFQQ_NAME_LENGTH 16
 
 /*
  * Soft real-time applications are extremely more latency sensitive
@@ -170,6 +170,9 @@ struct bfq_entity {
        /* budget, used also to calculate F_i: F_i = S_i + @budget / @weight */
        int budget;
 
+       /* Number of requests allocated in the subtree of this entity */
+       int allocated;
+
        /* device weight, if non-zero, it overrides the default weight of
         * bfq_group_data */
        int dev_weight;
@@ -266,8 +269,6 @@ struct bfq_queue {
        struct request *next_rq;
        /* number of sync and async requests queued */
        int queued[2];
-       /* number of requests currently allocated */
-       int allocated;
        /* number of pending metadata requests */
        int meta_pending;
        /* fifo list of requests in sort_list */
@@ -387,6 +388,8 @@ struct bfq_queue {
        struct bfq_queue *tentative_waker_bfqq;
        /* number of times the same tentative waker has been detected */
        unsigned int num_waker_detections;
+       /* time when we started considering this waker */
+       u64 waker_detection_started;
 
        /* node for woken_list, see below */
        struct hlist_node woken_list_node;
@@ -768,6 +771,7 @@ struct bfq_data {
         * function)
         */
        unsigned int word_depths[2][2];
+       unsigned int full_depth_shift;
 };
 
 enum bfqq_state_flags {
@@ -1079,26 +1083,27 @@ void bfq_add_bfqq_busy(struct bfq_data *bfqd, struct bfq_queue *bfqq);
 /* --------------- end of interface of B-WF2Q+ ---------------- */
 
 /* Logging facilities. */
-static inline void bfq_pid_to_str(int pid, char *str, int len)
+static inline void bfq_bfqq_name(struct bfq_queue *bfqq, char *str, int len)
 {
-       if (pid != -1)
-               snprintf(str, len, "%d", pid);
+       char type = bfq_bfqq_sync(bfqq) ? 'S' : 'A';
+
+       if (bfqq->pid != -1)
+               snprintf(str, len, "bfq%d%c", bfqq->pid, type);
        else
-               snprintf(str, len, "SHARED-");
+               snprintf(str, len, "bfqSHARED-%c", type);
 }
 
 #ifdef CONFIG_BFQ_GROUP_IOSCHED
 struct bfq_group *bfqq_group(struct bfq_queue *bfqq);
 
 #define bfq_log_bfqq(bfqd, bfqq, fmt, args...) do {                    \
-       char pid_str[MAX_PID_STR_LENGTH];       \
+       char pid_str[MAX_BFQQ_NAME_LENGTH];                             \
        if (likely(!blk_trace_note_message_enabled((bfqd)->queue)))     \
                break;                                                  \
-       bfq_pid_to_str((bfqq)->pid, pid_str, MAX_PID_STR_LENGTH);       \
+       bfq_bfqq_name((bfqq), pid_str, MAX_BFQQ_NAME_LENGTH);           \
        blk_add_cgroup_trace_msg((bfqd)->queue,                         \
                        bfqg_to_blkg(bfqq_group(bfqq))->blkcg,          \
-                       "bfq%s%c " fmt, pid_str,                        \
-                       bfq_bfqq_sync((bfqq)) ? 'S' : 'A', ##args);     \
+                       "%s " fmt, pid_str, ##args);                    \
 } while (0)
 
 #define bfq_log_bfqg(bfqd, bfqg, fmt, args...) do {                    \
@@ -1109,13 +1114,11 @@ struct bfq_group *bfqq_group(struct bfq_queue *bfqq);
 #else /* CONFIG_BFQ_GROUP_IOSCHED */
 
 #define bfq_log_bfqq(bfqd, bfqq, fmt, args...) do {    \
-       char pid_str[MAX_PID_STR_LENGTH];       \
+       char pid_str[MAX_BFQQ_NAME_LENGTH];                             \
        if (likely(!blk_trace_note_message_enabled((bfqd)->queue)))     \
                break;                                                  \
-       bfq_pid_to_str((bfqq)->pid, pid_str, MAX_PID_STR_LENGTH);       \
-       blk_add_trace_msg((bfqd)->queue, "bfq%s%c " fmt, pid_str,       \
-                       bfq_bfqq_sync((bfqq)) ? 'S' : 'A',              \
-                               ##args);        \
+       bfq_bfqq_name((bfqq), pid_str, MAX_BFQQ_NAME_LENGTH);           \
+       blk_add_trace_msg((bfqd)->queue, "%s " fmt, pid_str, ##args);   \
 } while (0)
 #define bfq_log_bfqg(bfqd, bfqg, fmt, args...)         do {} while (0)