Commit 860cbe92 authored by Marek Vasut's avatar Marek Vasut Committed by David S. Miller
Browse files

net: dsa: microchip: Inline ksz_spi.h 



The functions in the header file are static, and the header file is
included from single C file, just inline the code into the C file.
The bonus is that it's easier to spot further content to clean up.

Signed-off-by: default avatarMarek Vasut <marex@denx.de>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: Tristram Ha <Tristram.Ha@microchip.com>
Cc: Woojung Huh <Woojung.Huh@microchip.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 78e4e32f

drivers/net/dsa/microchip/ksz9477_spi.c

+42 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
#include <linux/spi/spi.h>



#include "ksz_priv.h"

#include "ksz_spi.h"



/* SPI frame opcodes */

#define KS_SPIOP_RD			3
@@ -73,6 +72,48 @@ static int ksz_spi_write(struct ksz_device *dev, u32 reg, void *data, 
	return ksz9477_spi_write_reg(spi, reg, dev->txbuf, len);

}



static int ksz_spi_read8(struct ksz_device *dev, u32 reg, u8 *val)

{

	return ksz_spi_read(dev, reg, val, 1);

}



static int ksz_spi_read16(struct ksz_device *dev, u32 reg, u16 *val)

{

	int ret = ksz_spi_read(dev, reg, (u8 *)val, 2);



	if (!ret)

		*val = be16_to_cpu(*val);



	return ret;

}



static int ksz_spi_read32(struct ksz_device *dev, u32 reg, u32 *val)

{

	int ret = ksz_spi_read(dev, reg, (u8 *)val, 4);



	if (!ret)

		*val = be32_to_cpu(*val);



	return ret;

}



static int ksz_spi_write8(struct ksz_device *dev, u32 reg, u8 value)

{

	return ksz_spi_write(dev, reg, &value, 1);

}



static int ksz_spi_write16(struct ksz_device *dev, u32 reg, u16 value)

{

	value = cpu_to_be16(value);

	return ksz_spi_write(dev, reg, &value, 2);

}



static int ksz_spi_write32(struct ksz_device *dev, u32 reg, u32 value)

{

	value = cpu_to_be32(value);

	return ksz_spi_write(dev, reg, &value, 4);

}



static const struct ksz_io_ops ksz9477_spi_ops = {

	.read8 = ksz_spi_read8,

	.read16 = ksz_spi_read16,

drivers/net/dsa/microchip/ksz_spi.h

deleted100644 → 0
+0 −59
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0

 * Microchip KSZ series SPI access common header

 *

 * Copyright (C) 2017-2018 Microchip Technology Inc.

 *	Tristram Ha <Tristram.Ha@microchip.com>

 */



#ifndef __KSZ_SPI_H

#define __KSZ_SPI_H



/* Chip dependent SPI access */

static int ksz_spi_read(struct ksz_device *dev, u32 reg, u8 *data,

			unsigned int len);

static int ksz_spi_write(struct ksz_device *dev, u32 reg, void *data,

			 unsigned int len);



static int ksz_spi_read8(struct ksz_device *dev, u32 reg, u8 *val)

{

	return ksz_spi_read(dev, reg, val, 1);

}



static int ksz_spi_read16(struct ksz_device *dev, u32 reg, u16 *val)

{

	int ret = ksz_spi_read(dev, reg, (u8 *)val, 2);



	if (!ret)

		*val = be16_to_cpu(*val);



	return ret;

}



static int ksz_spi_read32(struct ksz_device *dev, u32 reg, u32 *val)

{

	int ret = ksz_spi_read(dev, reg, (u8 *)val, 4);



	if (!ret)

		*val = be32_to_cpu(*val);



	return ret;

}



static int ksz_spi_write8(struct ksz_device *dev, u32 reg, u8 value)

{

	return ksz_spi_write(dev, reg, &value, 1);

}



static int ksz_spi_write16(struct ksz_device *dev, u32 reg, u16 value)

{

	value = cpu_to_be16(value);

	return ksz_spi_write(dev, reg, &value, 2);

}



static int ksz_spi_write32(struct ksz_device *dev, u32 reg, u32 value)

{

	value = cpu_to_be32(value);

	return ksz_spi_write(dev, reg, &value, 4);

}



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE