Remove io.Writer from spi.Conn

This was interface creep

devices/apa102/apa102.go

@@ -251,7 +251,7 @@ func (d *Dev) Draw(r image.Rectangle, src image.Image, sp image.Point) {
 	}
 	d.l.init(d.Intensity, d.Temperature)
 	d.l.rasterImg(d.buf[4:4+4*d.numLights], r, src, srcR)
-	_, _ = d.s.Write(d.buf)
+	_ = d.s.Tx(d.buf, nil)
 }
 
 // Write accepts a stream of raw RGB pixels and sends it as APA102 encoded
@@ -262,7 +262,7 @@ func (d *Dev) Write(pixels []byte) (int, error) {
 	}
 	d.l.init(d.Intensity, d.Temperature)
 	d.l.raster(d.buf[4:4+4*d.numLights], pixels)
-	_, err := d.s.Write(d.buf)
+	err := d.s.Tx(d.buf, nil)
 	return len(pixels), err
 }
 

devices/ssd1306/ssd1306.go

@@ -38,9 +38,9 @@ import (
 	"fmt"
 	"image"
 	"image/color"
-	"io"
 	"log"
 
+	"periph.io/x/periph/conn"
 	"periph.io/x/periph/conn/i2c"
 	"periph.io/x/periph/conn/spi"
 	"periph.io/x/periph/devices"
@@ -75,7 +75,7 @@ const (
 
 // Dev is an open handle to the display controler.
 type Dev struct {
-	w io.Writer
+	c conn.Conn
 	W int
 	H int
 }
@@ -110,14 +110,14 @@ func NewI2C(i i2c.Bus, w, h int, rotated bool) (*Dev, error) {
 
 // newDev is the common initialization code that is independent of the bus
 // being used.
-func newDev(dev io.Writer, w, h int, rotated bool) (*Dev, error) {
+func newDev(c conn.Conn, w, h int, rotated bool) (*Dev, error) {
 	if w < 8 || w > 128 || w&7 != 0 {
 		return nil, fmt.Errorf("ssd1306: invalid width %d", w)
 	}
 	if h < 8 || h > 64 || h&7 != 0 {
 		return nil, fmt.Errorf("ssd1306: invalid height %d", h)
 	}
-	d := &Dev{w: dev, W: w, H: h}
+	d := &Dev{c: c, W: w, H: h}
 
 	// Set COM output scan direction; C0 means normal; C8 means reversed
 	comScan := byte(0xC8)
@@ -156,7 +156,7 @@ func newDev(dev io.Writer, w, h int, rotated bool) (*Dev, error) {
 		0xA8, byte(d.H - 1), // Set multiplex ratio (number of lines to display)
 		0xAF, // Display on
 	}
-	if _, err := d.w.Write(init); err != nil {
+	if err := d.c.Tx(init, nil); err != nil {
 		return nil, err
 	}
 
@@ -253,12 +253,12 @@ func (d *Dev) Write(pixels []byte) (int, error) {
 		0x21, 0x00, byte(d.W - 1), // Set start/end column
 		0x22, 0x00, byte(d.H/8 - 1), // Set start/end page
 	}
-	if _, err := d.w.Write(hdr); err != nil {
+	if err := d.c.Tx(hdr, nil); err != nil {
 		return 0, err
 	}
 
 	// Write the data.
-	if _, err := d.w.Write(append([]byte{i2cData}, pixels...)); err != nil {
+	if err := d.c.Tx(append([]byte{i2cData}, pixels...), nil); err != nil {
 		return 0, err
 	}
 
@@ -272,30 +272,26 @@ func (d *Dev) Scroll(o Orientation, rate FrameRate) error {
 	if o == Left || o == Right {
 		// page 28
 		// STOP, <op>, dummy, <start page>, <rate>,  <end page>, <dummy>, <dummy>, <ENABLE>
-		_, err := d.w.Write([]byte{i2cCmd, 0x2E, byte(o), 0x00, 0x00, byte(rate), 0x07, 0x00, 0xFF, 0x2F})
+		return d.c.Tx([]byte{i2cCmd, 0x2E, byte(o), 0x00, 0x00, byte(rate), 0x07, 0x00, 0xFF, 0x2F}, nil)
-		return err
 	}
 	// page 29
 	// STOP, <op>, dummy, <start page>, <rate>,  <end page>, <offset>, <ENABLE>
 	// page 30: 0xA3 permits to set rows for scroll area.
-	_, err := d.w.Write([]byte{i2cCmd, 0x2E, byte(o), 0x00, 0x00, byte(rate), 0x07, 0x01, 0x2F})
+	return d.c.Tx([]byte{i2cCmd, 0x2E, byte(o), 0x00, 0x00, byte(rate), 0x07, 0x01, 0x2F}, nil)
-	return err
 }
 
 // StopScroll stops any scrolling previously set.
 //
 // It will only take effect after redrawing the ram.
 func (d *Dev) StopScroll() error {
-	_, err := d.w.Write([]byte{i2cCmd, 0x2E})
+	return d.c.Tx([]byte{i2cCmd, 0x2E}, nil)
-	return err
 }
 
 // SetContrast changes the screen contrast.
 //
 // Note: values other than 0xff do not seem useful...
 func (d *Dev) SetContrast(level byte) error {
-	_, err := d.w.Write([]byte{i2cCmd, 0x81, level})
+	return d.c.Tx([]byte{i2cCmd, 0x81, level}, nil)
-	return err
 }
 
 // Enable or disable the display.
@@ -304,8 +300,7 @@ func (d *Dev) Enable(on bool) error {
 	if on {
 		b = 0xAF
 	}
-	_, err := d.w.Write([]byte{i2cCmd, b})
+	return d.c.Tx([]byte{i2cCmd, b}, nil)
-	return err
 }
 
 // Invert the display (black on white vs white on black).
@@ -314,8 +309,7 @@ func (d *Dev) Invert(blackOnWhite bool) error {
 	if blackOnWhite {
 		b = 0xA7
 	}
-	_, err := d.w.Write([]byte{i2cCmd, b})
+	return d.c.Tx([]byte{i2cCmd, b}, nil)
-	return err
 }
 
 const (