[spi] Remove a few lint errors to clean-up output

- tie off unused from spi host
- temporarily remove combo loop in spi device
- changes to case inside usage

Signed-off-by: Timothy Chen <timothytim@google.com>
diff --git a/hw/ip/spi_device/lint/spi_device.waiver b/hw/ip/spi_device/lint/spi_device.waiver
index d0b4191..c64efb3 100644
--- a/hw/ip/spi_device/lint/spi_device.waiver
+++ b/hw/ip/spi_device/lint/spi_device.waiver
@@ -70,6 +70,9 @@
 waive -rules CONST_FF -location {spi_device.sv} -msg {Flip-flop 'fwm_rxerr_q' is driven by constant zero} \
       -comment "This is an unimplemented error signal which is currently tied to 0."
 
+# intentional terminal states
+waive -rules TERMINAL_STATE -location {spi_cmdparse.sv} -regexp {Terminal state 'St(Status|Jedec|Sfdp|ReadCmd|Upload)' is detected}
+
 # async resets
 waive -rules RESET_DRIVER -location {spi_device.sv} -regexp {'rst_(spi|txfifo|rxfifo)_n' is driven here, and used as an asynchronous reset} \
       -comment "Async reset generation is required here"
diff --git a/hw/ip/spi_device/rtl/spi_cmdparse.sv b/hw/ip/spi_device/rtl/spi_cmdparse.sv
index 808b178..3b62d08 100644
--- a/hw/ip/spi_device/rtl/spi_cmdparse.sv
+++ b/hw/ip/spi_device/rtl/spi_cmdparse.sv
@@ -236,4 +236,3 @@
   ///////////////
 
 endmodule
-
diff --git a/hw/ip/spi_device/rtl/spi_readcmd.sv b/hw/ip/spi_device/rtl/spi_readcmd.sv
index 3d9d7a1..3aa4013 100644
--- a/hw/ip/spi_device/rtl/spi_readcmd.sv
+++ b/hw/ip/spi_device/rtl/spi_readcmd.sv
@@ -158,7 +158,7 @@
 );
 
   logic unused_threshold;
-  assign unused_threshold = &{1'b0, readbuf_threshold_i};
+  assign unused_threshold = ^readbuf_threshold_i;
   assign read_watermark_o = 1'b 0;
 
   /////////////////
@@ -620,4 +620,3 @@
 
 
 endmodule : spi_readcmd
-