From 06d26b4102f6b699cfd2908a686effb6a9746c42 Mon Sep 17 00:00:00 2001
From: Ron Evans <ron@hybridgroup.com>
Date: Mon, 16 Apr 2018 09:56:17 +0200
Subject: [PATCH] spi: remove unneeded code as suggested by @maruel

Signed-off-by: Ron Evans <ron@hybridgroup.com>
---
 drivers/spi/{README.MD => README.md} |  0
 drivers/spi/spi.go                   | 37 ++++++----------------------
 2 files changed, 7 insertions(+), 30 deletions(-)
 rename drivers/spi/{README.MD => README.md} (100%)

diff --git a/drivers/spi/README.MD b/drivers/spi/README.md
similarity index 100%
rename from drivers/spi/README.MD
rename to drivers/spi/README.md
diff --git a/drivers/spi/spi.go b/drivers/spi/spi.go
index 86033351..8a4291df 100644
--- a/drivers/spi/spi.go
+++ b/drivers/spi/spi.go
@@ -1,12 +1,8 @@
 package spi
 
 import (
-	"fmt"
-	"log"
-
 	xspi "periph.io/x/periph/conn/spi"
-	"periph.io/x/periph/conn/spi/spireg"
-	"periph.io/x/periph/host"
+	xsysfs "periph.io/x/periph/host/sysfs"
 )
 
 const (
@@ -56,6 +52,8 @@ type Connector interface {
 // Provided by an Adaptor by implementing the SPIConnector interface.
 type Connection Operations
 
+// SpiConnection is the implementation of the SPI interface using the periph.io
+// implementataion for Linux.
 type SpiConnection struct {
 	Connection
 	port     xspi.PortCloser
@@ -84,35 +82,14 @@ func (c *SpiConnection) Tx(w, r []byte) error {
 }
 
 // GetSpiConnection is a helper to return a SPI device
-func GetSpiConnection(busNum, chipNum, mode, bits int, maxSpeed int64) (spiDevice Device, err error) {
-	if _, err := host.Init(); err != nil {
-		log.Fatal(err)
-	}
-
-	var spiMode xspi.Mode
-	switch mode {
-	case 0:
-		spiMode = xspi.Mode0
-	case 1:
-		spiMode = xspi.Mode1
-	case 2:
-		spiMode = xspi.Mode2
-	case 3:
-		spiMode = xspi.Mode3
-	default:
-		spiMode = xspi.Mode0
-	}
-	devName := fmt.Sprintf("/dev/spidev%d.%d", busNum, chipNum)
-	p, err := spireg.Open(devName)
+func GetSpiConnection(busNum, chipNum, mode, bits int, maxSpeed int64) (Device, error) {
+	p, err := xsysfs.NewSPI(busNum, chipNum)
 	if err != nil {
 		return nil, err
 	}
-
-	c, err := p.Connect(maxSpeed, spiMode, bits)
+	c, err := p.Connect(maxSpeed, xspi.Mode(mode), bits)
 	if err != nil {
 		return nil, err
 	}
-	spiDevice = NewConnection(p, c)
-
-	return
+	return NewConnection(p, c), nil
 }