From 0e945d50d625487dfbb604778af85e84db4c3f8a Mon Sep 17 00:00:00 2001
From: Wilfried Chauveau <wilfried.chauveau@ithinuel.me>
Date: Sat, 17 Aug 2024 13:35:05 +0100
Subject: [PATCH 1/2] spi: remove undesired parameter to `set_format`

---
 rp2040-hal/src/spi.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/rp2040-hal/src/spi.rs b/rp2040-hal/src/spi.rs
index 0969b1e6b..58425ab20 100644
--- a/rp2040-hal/src/spi.rs
+++ b/rp2040-hal/src/spi.rs
@@ -248,10 +248,10 @@ impl<S: State, D: SpiDevice, P: ValidSpiPinout<D>, const DS: u8> Spi<S, D, P, DS
         (freq_in / (prescale as u32 * (1 + postdiv as u32))).Hz()
     }
 
-    /// Set format and datasize
-    pub fn set_format(&mut self, data_bits: u8, frame_format: FrameFormat) {
+    /// Set format
+    pub fn set_format(&mut self, frame_format: FrameFormat) {
         self.device.sspcr0().modify(|_, w| unsafe {
-            w.dss().bits(data_bits - 1).frf().bits(match &frame_format {
+            w.dss().bits(DS - 1).frf().bits(match &frame_format {
                 FrameFormat::MotorolaSpi(_) => 0x00,
                 FrameFormat::TexasInstrumentsSynchronousSerial => 0x01,
                 FrameFormat::NationalSemiconductorMicrowire => 0x10,
@@ -309,7 +309,7 @@ impl<D: SpiDevice, P: ValidSpiPinout<D>, const DS: u8> Spi<Disabled, D, P, DS> {
         self.device.reset_bring_up(resets);
 
         self.set_baudrate(peri_frequency, baudrate);
-        self.set_format(DS, frame_format);
+        self.set_format(frame_format);
         self.set_slave(slave);
         // Always enable DREQ signals -- harmless if DMA is not listening
         self.device

From 982dbb1e1e2a01d3fa927ae509dffe1255a4e756 Mon Sep 17 00:00:00 2001
From: Jan Niehusmann <jan@gondor.com>
Date: Sat, 12 Oct 2024 13:01:29 +0000
Subject: [PATCH 2/2] spi: port `set_format` changes to rp235x

---
 rp235x-hal/src/spi.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/rp235x-hal/src/spi.rs b/rp235x-hal/src/spi.rs
index 61cf85f85..6533e7245 100644
--- a/rp235x-hal/src/spi.rs
+++ b/rp235x-hal/src/spi.rs
@@ -274,10 +274,10 @@ impl<S: State, D: SpiDevice, P: ValidSpiPinout<D>, const DS: u8> Spi<S, D, P, DS
         (freq_in / (prescale as u32 * (1 + postdiv as u32))).Hz()
     }
 
-    /// Set format and datasize
-    pub fn set_format(&mut self, data_bits: u8, frame_format: FrameFormat) {
+    /// Set format
+    pub fn set_format(&mut self, frame_format: FrameFormat) {
         self.device.sspcr0().modify(|_, w| unsafe {
-            w.dss().bits(data_bits - 1).frf().bits(match &frame_format {
+            w.dss().bits(DS - 1).frf().bits(match &frame_format {
                 FrameFormat::MotorolaSpi(_) => 0x00,
                 FrameFormat::TexasInstrumentsSynchronousSerial => 0x01,
                 FrameFormat::NationalSemiconductorMicrowire => 0x10,
@@ -335,7 +335,7 @@ impl<D: SpiDevice, P: ValidSpiPinout<D>, const DS: u8> Spi<Disabled, D, P, DS> {
         self.device.reset_bring_up(resets);
 
         self.set_baudrate(peri_frequency, baudrate);
-        self.set_format(DS, frame_format);
+        self.set_format(frame_format);
         self.set_slave(slave);
         // Always enable DREQ signals -- harmless if DMA is not listening
         self.device