[prim/tlul] Various small lint fixes

Signed-off-by: Michael Schaffner <msf@google.com>
diff --git a/hw/ip/tlul/rtl/tlul_adapter_sram.sv b/hw/ip/tlul/rtl/tlul_adapter_sram.sv
index 6e2f331..b13a281 100644
--- a/hw/ip/tlul/rtl/tlul_adapter_sram.sv
+++ b/hw/ip/tlul/rtl/tlul_adapter_sram.sv
@@ -240,7 +240,7 @@
   assign rspfifo_wvalid = rvalid_i & reqfifo_rvalid;
 
   // Make sure only requested bytes are forwarded
-  logic [SramDw-1:0] rdata;
+  logic [WidthMult-1:0][top_pkg::TL_DW-1:0] rdata;
   logic [WidthMult-1:0][top_pkg::TL_DW-1:0] rmask;
   //logic [SramDw-1:0] rmask;
   logic [top_pkg::TL_DW-1:0] rdata_tlword;
@@ -253,7 +253,7 @@
   end
 
   assign rdata = rdata_i & rmask;
-  assign rdata_tlword = rdata[sramreqfifo_rdata.woffset * top_pkg::TL_DW +: top_pkg::TL_DW];
+  assign rdata_tlword = rdata[sramreqfifo_rdata.woffset];
 
   assign rspfifo_wdata  = '{
     data : rdata_tlword,