From: Marek Vasut <marex@denx.de>
To: netdev@vger.kernel.org
Cc: f.fainelli@gmail.com, andrew@lunn.ch, Marek Vasut <marex@denx.de>,
Tristram Ha <Tristram.Ha@microchip.com>,
Woojung Huh <Woojung.Huh@microchip.com>
Subject: [RFT][PATCH 4/7] net: dsa: microchip: Remove dev->txbuf
Date: Thu, 20 Dec 2018 02:06:44 +0100 [thread overview]
Message-ID: <20181220010647.4059-5-marex@denx.de> (raw)
In-Reply-To: <20181220010647.4059-1-marex@denx.de>
Previous patches unconver that ksz_spi_write() is always ever called
with len = 1, 2 or 4. We can thus drop the if (len > SPI_TX_BUF_LEN)
check and we can also drop the allocation of the txbuf which is part
of the driver data. This wastes 256 bytes for no reason and can be
replaced with 8-byte stack allocated buffer, which is what this patch
does. This is an intermediate step though, which will go away after
regmap conversion.
Signed-off-by: Marek 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>
---
drivers/net/dsa/microchip/ksz9477_spi.c | 10 ++++------
drivers/net/dsa/microchip/ksz_priv.h | 2 --
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/drivers/net/dsa/microchip/ksz9477_spi.c b/drivers/net/dsa/microchip/ksz9477_spi.c
index 9ca150a472ea..69baf9677def 100644
--- a/drivers/net/dsa/microchip/ksz9477_spi.c
+++ b/drivers/net/dsa/microchip/ksz9477_spi.c
@@ -65,11 +65,11 @@ static int ksz_spi_write(struct ksz_device *dev, u32 reg, void *data,
unsigned int len)
{
struct spi_device *spi = dev->priv;
+ u8 txbuf[8];
- if (len > SPI_TX_BUF_LEN)
- len = SPI_TX_BUF_LEN;
- memcpy(&dev->txbuf[4], data, len);
- return ksz9477_spi_write_reg(spi, reg, dev->txbuf, len);
+ memcpy(txbuf + 4, data, len);
+
+ return ksz9477_spi_write_reg(spi, reg, txbuf, len);
}
static int ksz_spi_read8(struct ksz_device *dev, u32 reg, u8 *val)
@@ -135,8 +135,6 @@ static int ksz9477_spi_probe(struct spi_device *spi)
if (spi->dev.platform_data)
dev->pdata = spi->dev.platform_data;
- dev->txbuf = devm_kzalloc(dev->dev, 4 + SPI_TX_BUF_LEN, GFP_KERNEL);
-
ret = ksz9477_switch_register(dev);
/* Main DSA driver may not be started yet. */
diff --git a/drivers/net/dsa/microchip/ksz_priv.h b/drivers/net/dsa/microchip/ksz_priv.h
index c3a272505af1..3ab14ee0e36b 100644
--- a/drivers/net/dsa/microchip/ksz_priv.h
+++ b/drivers/net/dsa/microchip/ksz_priv.h
@@ -81,8 +81,6 @@ struct ksz_device {
u64 mib_value[TOTAL_SWITCH_COUNTER_NUM];
- u8 *txbuf;
-
struct ksz_port *ports;
struct timer_list mib_read_timer;
struct work_struct mib_read;
--
2.19.2
next prev parent reply other threads:[~2018-12-20 1:07 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-20 1:06 [RFT][PATCH 0/7] net: dsa: microchip: Convert to regmap Marek Vasut
2018-12-20 1:06 ` [RFT][PATCH 1/7] net: dsa: microchip: Remove ksz_{read,write}24() Marek Vasut
2018-12-20 1:06 ` [RFT][PATCH 2/7] net: dsa: microchip: Remove ksz_{get,set}() Marek Vasut
2018-12-20 1:06 ` [RFT][PATCH 3/7] net: dsa: microchip: Inline ksz_spi.h Marek Vasut
2018-12-20 1:06 ` Marek Vasut [this message]
2018-12-20 1:20 ` [RFT][PATCH 4/7] net: dsa: microchip: Remove dev->txbuf Florian Fainelli
2018-12-20 9:41 ` Andrew Lunn
2018-12-20 14:35 ` Marek Vasut
2018-12-21 1:02 ` Tristram.Ha
2018-12-21 2:04 ` Marek Vasut
2018-12-21 9:30 ` Andrew Lunn
2018-12-20 18:57 ` Marek Vasut
2018-12-20 1:06 ` [RFT][PATCH 5/7] net: dsa: microchip: Factor out register access opcode generation Marek Vasut
2018-12-20 1:06 ` [RFT][PATCH 6/7] net: dsa: microchip: Initial SPI regmap support Marek Vasut
2018-12-21 1:30 ` Tristram.Ha
2018-12-21 2:04 ` Marek Vasut
2018-12-20 1:06 ` [RFT][PATCH 7/7] net: dsa: microchip: Dispose of ksz_io_ops Marek Vasut
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181220010647.4059-5-marex@denx.de \
--to=marex@denx.de \
--cc=Tristram.Ha@microchip.com \
--cc=Woojung.Huh@microchip.com \
--cc=andrew@lunn.ch \
--cc=f.fainelli@gmail.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).