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

net: dsa: microchip: Remove ksz_{read,write}24() 



These functions and callbacks are never used, remove them.

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 1c57de69

drivers/net/dsa/microchip/ksz9477_spi.c

+0 −25
Original line number Diff line number Diff line
@@ -73,37 +73,12 @@ 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_read24(struct ksz_device *dev, u32 reg, u32 *val)

{

	int ret;



	*val = 0;

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

	if (!ret) {

		*val = be32_to_cpu(*val);

		/* convert to 24bit */

		*val >>= 8;

	}



	return ret;

}



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

{

	/* make it to big endian 24bit from MSB */

	value <<= 8;

	value = cpu_to_be32(value);

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

}



static const struct ksz_io_ops ksz9477_spi_ops = {

	.read8 = ksz_spi_read8,

	.read16 = ksz_spi_read16,

	.read24 = ksz_spi_read24,

	.read32 = ksz_spi_read32,

	.write8 = ksz_spi_write8,

	.write16 = ksz_spi_write16,

	.write24 = ksz_spi_write24,

	.write32 = ksz_spi_write32,

	.get = ksz_spi_get,

	.set = ksz_spi_set,

drivers/net/dsa/microchip/ksz_common.h

+0 −22
Original line number Diff line number Diff line
@@ -61,17 +61,6 @@ static inline int ksz_read16(struct ksz_device *dev, u32 reg, u16 *val) 
	return ret;

}



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

{

	int ret;



	mutex_lock(&dev->reg_mutex);

	ret = dev->ops->read24(dev, reg, val);

	mutex_unlock(&dev->reg_mutex);



	return ret;

}



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

{

	int ret;
@@ -105,17 +94,6 @@ static inline int ksz_write16(struct ksz_device *dev, u32 reg, u16 value) 
	return ret;

}



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

{

	int ret;



	mutex_lock(&dev->reg_mutex);

	ret = dev->ops->write24(dev, reg, value);

	mutex_unlock(&dev->reg_mutex);



	return ret;

}



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

{

	int ret;

drivers/net/dsa/microchip/ksz_priv.h

+0 −2
Original line number Diff line number Diff line
@@ -105,11 +105,9 @@ struct ksz_device { 
struct ksz_io_ops {

	int (*read8)(struct ksz_device *dev, u32 reg, u8 *value);

	int (*read16)(struct ksz_device *dev, u32 reg, u16 *value);

	int (*read24)(struct ksz_device *dev, u32 reg, u32 *value);

	int (*read32)(struct ksz_device *dev, u32 reg, u32 *value);

	int (*write8)(struct ksz_device *dev, u32 reg, u8 value);

	int (*write16)(struct ksz_device *dev, u32 reg, u16 value);

	int (*write24)(struct ksz_device *dev, u32 reg, u32 value);

	int (*write32)(struct ksz_device *dev, u32 reg, u32 value);

	int (*get)(struct ksz_device *dev, u32 reg, void *data, size_t len);

	int (*set)(struct ksz_device *dev, u32 reg, void *data, size_t len);

CRA Git | Maintained and supported by SUSTech CRA and CCSE