bash-completion: update irqtop and lsirq completions

Signed-off-by: Sami Kerola <kerolasa@iki.fi>

bash-completion/Makemodule.am

@@ -60,6 +60,9 @@ endif
 if BUILD_LSIPC
 dist_bashcompletion_DATA += bash-completion/lsipc
 endif
+if BUILD_LSIRQ
+dist_bashcompletion_DATA += bash-completion/lsirq
+endif
 if BUILD_LSNS
 dist_bashcompletion_DATA += bash-completion/lsns
 endif

bash-completion/irqtop

@@ -10,10 +10,10 @@ _irqtop_module()
 			return 0
 			;;
 		'-s'|'--sort')
-			COMPREPLY=( $(compgen -W "i t d n" -- $cur) )
+			COMPREPLY=( $(compgen -W "irq total delta name" -- $cur) )
 			return 0
 			;;
-		'--columns')
+		'-o'|'--output')
 			local prefix realcur OUTPUT
 			realcur="${cur##*,}"
 			prefix="${cur%$realcur}"
@@ -31,10 +31,8 @@ _irqtop_module()
 			;;
 	esac
 	OPTS="	--delay
-		--once
-		--json
 		--sort
-		--columns
+		--output
 		--help
 		--version"
 	COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )

bash-completion/lsirq

@@ -0,0 +1,38 @@
+_lsirq_module()
+{
+	local cur prev OPTS
+	COMPREPLY=()
+	cur="${COMP_WORDS[COMP_CWORD]}"
+	prev="${COMP_WORDS[COMP_CWORD-1]}"
+	case $prev in
+		'-o'|'--output')
+			local prefix realcur OUTPUT
+			realcur="${cur##*,}"
+			prefix="${cur%$realcur}"
+			for WORD in "IRQ TOTAL NAME"; do
+				if ! [[ $prefix == *"$WORD"* ]]; then
+					OUTPUT="$WORD ${OUTPUT:-""}"
+				fi
+			done
+			compopt -o nospace
+			COMPREPLY=( $(compgen -P "$prefix" -W "$OUTPUT" -S ',' -- $realcur) )
+			return 0
+			;;
+		'-s'|'--sort')
+			COMPREPLY=( $(compgen -W "irq total name" -- $cur) )
+			return 0
+			;;
+		'-h'|'--help'|'-V'|'--version')
+			return 0
+			;;
+	esac
+	OPTS="	--json
+		--pairs
+		--output
+		--sort
+		--help
+		--version"
+	COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
+	return 0
+}
+complete -F _lsirq_module lsirq