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

net: dsa: microchip: Dispose of ksz_io_ops 



Since the driver now uses regmap , get rid of ad-hoc ksz_io_ops
abstraction, which no longer has any meaning. Moreover, since regmap
has it's own locking, get rid of the register access mutex.

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>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 46558d60

drivers/net/dsa/microchip/ksz9477_spi.c

+1 −56
Original line number Diff line number Diff line
@@ -46,67 +46,12 @@ static const struct regmap_config ksz9477_regmap_config[] = { 
	KSZ_REGMAP_COMMON(32),

};



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

{

	unsigned int value;

	int ret = regmap_read(dev->regmap, reg, &value);



	*val = value;

	return ret;

}



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

{

	int ret = regmap_bulk_read(dev->regmap, reg, 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 = regmap_bulk_read(dev->regmap, reg, 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 regmap_write(dev->regmap, reg, value);

}



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

{

	value = cpu_to_be16(value);

	return regmap_bulk_write(dev->regmap, reg, &value, 2);

}



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

{

	value = cpu_to_be32(value);

	return regmap_bulk_write(dev->regmap, reg, &value, 4);

}



static const struct ksz_io_ops ksz9477_spi_ops = {

	.read8 = ksz_spi_read8,

	.read16 = ksz_spi_read16,

	.read32 = ksz_spi_read32,

	.write8 = ksz_spi_write8,

	.write16 = ksz_spi_write16,

	.write32 = ksz_spi_write32,

};



static int ksz9477_spi_probe(struct spi_device *spi)

{

	struct ksz_device *dev;

	int i, ret;



	dev = ksz_switch_alloc(&spi->dev, &ksz9477_spi_ops, spi);

	dev = ksz_switch_alloc(&spi->dev, spi);

	if (!dev)

		return -ENOMEM;

drivers/net/dsa/microchip/ksz_common.c

+1 −5
Original line number Diff line number Diff line
@@ -396,9 +396,7 @@ void ksz_disable_port(struct dsa_switch *ds, int port) 
}

EXPORT_SYMBOL_GPL(ksz_disable_port);



struct ksz_device *ksz_switch_alloc(struct device *base,

				    const struct ksz_io_ops *ops,

				    void *priv)

struct ksz_device *ksz_switch_alloc(struct device *base, void *priv)

{

	struct dsa_switch *ds;

	struct ksz_device *swdev;
@@ -416,7 +414,6 @@ struct ksz_device *ksz_switch_alloc(struct device *base, 


	swdev->ds = ds;

	swdev->priv = priv;

	swdev->ops = ops;



	return swdev;

}
@@ -442,7 +439,6 @@ int ksz_switch_register(struct ksz_device *dev, 
	}



	mutex_init(&dev->dev_mutex);

	mutex_init(&dev->reg_mutex);

	mutex_init(&dev->stats_mutex);

	mutex_init(&dev->alu_mutex);

	mutex_init(&dev->vlan_mutex);

drivers/net/dsa/microchip/ksz_common.h

+14 −36
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ 
#ifndef __KSZ_COMMON_H

#define __KSZ_COMMON_H



#include <linux/regmap.h>



void ksz_port_cleanup(struct ksz_device *dev, int port);

void ksz_update_port_member(struct ksz_device *dev, int port);

void ksz_init_mib_timer(struct ksz_device *dev);
@@ -41,68 +43,44 @@ void ksz_disable_port(struct dsa_switch *ds, int port); 


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

{

	int ret;



	mutex_lock(&dev->reg_mutex);

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

	mutex_unlock(&dev->reg_mutex);

	unsigned int value;

	int ret = regmap_read(dev->regmap[0], reg, &value);



	*val = value;

	return ret;

}



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

{

	int ret;



	mutex_lock(&dev->reg_mutex);

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

	mutex_unlock(&dev->reg_mutex);

	unsigned int value;

	int ret = regmap_read(dev->regmap[1], reg, &value);



	*val = value;

	return ret;

}



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

{

	int ret;



	mutex_lock(&dev->reg_mutex);

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

	mutex_unlock(&dev->reg_mutex);

	unsigned int value;

	int ret = regmap_read(dev->regmap[2], reg, &value);



	*val = value;

	return ret;

}



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

{

	int ret;



	mutex_lock(&dev->reg_mutex);

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

	mutex_unlock(&dev->reg_mutex);



	return ret;

	return regmap_write(dev->regmap[0], reg, value);

}



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

{

	int ret;



	mutex_lock(&dev->reg_mutex);

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

	mutex_unlock(&dev->reg_mutex);



	return ret;

	return regmap_write(dev->regmap[1], reg, value);

}



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

{

	int ret;



	mutex_lock(&dev->reg_mutex);

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

	mutex_unlock(&dev->reg_mutex);



	return ret;

	return regmap_write(dev->regmap[2], reg, value);

}



static inline void ksz_pread8(struct ksz_device *dev, int port, int offset,

drivers/net/dsa/microchip/ksz_priv.h

+1 −15
Original line number Diff line number Diff line
@@ -14,8 +14,6 @@ 
#include <linux/etherdevice.h>

#include <net/dsa.h>



struct ksz_io_ops;



struct vlan_table {

	u32 table[3];

};
@@ -49,11 +47,9 @@ struct ksz_device { 
	const char *name;



	struct mutex dev_mutex;		/* device access */

	struct mutex reg_mutex;		/* register access */

	struct mutex stats_mutex;	/* status access */

	struct mutex alu_mutex;		/* ALU access */

	struct mutex vlan_mutex;	/* vlan access */

	const struct ksz_io_ops *ops;

	const struct ksz_dev_ops *dev_ops;



	struct device *dev;
@@ -101,15 +97,6 @@ struct ksz_device { 
	u16 port_mask;

};



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 (*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 (*write32)(struct ksz_device *dev, u32 reg, u32 value);

};



struct alu_struct {

	/* entry 1 */

	u8	is_static:1;
@@ -158,8 +145,7 @@ struct ksz_dev_ops { 
	void (*exit)(struct ksz_device *dev);

};



struct ksz_device *ksz_switch_alloc(struct device *base,

				    const struct ksz_io_ops *ops, void *priv);

struct ksz_device *ksz_switch_alloc(struct device *base, void *priv);

int ksz_switch_register(struct ksz_device *dev,

			const struct ksz_dev_ops *ops);

void ksz_switch_remove(struct ksz_device *dev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE