From: Neil Armstrong <narmstrong@baylibre•com>
To: "David S. Miller" <davem@davemloft•net>
Cc: Andrew Lunn <andrew@lunn•ch>,
Florian Fainelli <f.fainelli@gmail•com>,
Guenter Roeck <linux@roeck-us•net>,
vivien.didelot@savoirfairelinux•com,
Fabian Frederick <fabf@skynet•be>,
Pavel Nakonechny <pavel.nakonechny@skitlab•ru>,
Joe Perches <joe@perches•com>,
netdev@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: [RFC PATCH v2 3/4] net: dsa: mv88e6xxx: add common and ppu remove function
Date: Wed, 28 Oct 2015 15:13:16 +0100 [thread overview]
Message-ID: <5630D7FC.4010509@baylibre.com> (raw)
With the previously introduced remove callback, add a
mv88e6xxx common remove function to cleanup all resources.
Signed-off-by: Neil Armstrong <narmstrong@baylibre•com>
---
drivers/net/dsa/mv88e6xxx.c | 18 ++++++++++++++++++
drivers/net/dsa/mv88e6xxx.h | 2 ++
2 files changed, 20 insertions(+)
diff --git a/drivers/net/dsa/mv88e6xxx.c b/drivers/net/dsa/mv88e6xxx.c
index b1b14f5..6287096 100644
--- a/drivers/net/dsa/mv88e6xxx.c
+++ b/drivers/net/dsa/mv88e6xxx.c
@@ -331,6 +331,16 @@ void mv88e6xxx_ppu_state_init(struct dsa_switch *ds)
ps->ppu_timer.function = mv88e6xxx_ppu_reenable_timer;
}
+void mv88e6xxx_ppu_state_remove(struct dsa_switch *ds)
+{
+ struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);
+
+ del_timer_sync(&ps->ppu_timer);
+
+ cancel_work_sync(&ps->bridge_work);
+ flush_work(&ps->bridge_work);
+}
+
int mv88e6xxx_phy_read_ppu(struct dsa_switch *ds, int addr, int regnum)
{
int ret;
@@ -2083,6 +2093,14 @@ int mv88e6xxx_setup_common(struct dsa_switch *ds)
return 0;
}
+void mv88e6xxx_remove_common(struct dsa_switch *ds)
+{
+ struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);
+
+ cancel_work_sync(&ps->bridge_work);
+ flush_work(&ps->bridge_work);
+}
+
int mv88e6xxx_setup_global(struct dsa_switch *ds)
{
struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);
diff --git a/drivers/net/dsa/mv88e6xxx.h b/drivers/net/dsa/mv88e6xxx.h
index 6f9ed5d..64d37a0 100644
--- a/drivers/net/dsa/mv88e6xxx.h
+++ b/drivers/net/dsa/mv88e6xxx.h
@@ -417,6 +417,7 @@ struct mv88e6xxx_hw_stat {
int mv88e6xxx_switch_reset(struct dsa_switch *ds, bool ppu_active);
int mv88e6xxx_setup_ports(struct dsa_switch *ds);
int mv88e6xxx_setup_common(struct dsa_switch *ds);
+void mv88e6xxx_remove_common(struct dsa_switch *ds);
int mv88e6xxx_setup_global(struct dsa_switch *ds);
int __mv88e6xxx_reg_read(struct mii_bus *bus, int sw_addr, int addr, int reg);
int mv88e6xxx_reg_read(struct dsa_switch *ds, int addr, int reg);
@@ -431,6 +432,7 @@ int mv88e6xxx_phy_read_indirect(struct dsa_switch *ds, int port, int regnum);
int mv88e6xxx_phy_write_indirect(struct dsa_switch *ds, int port, int regnum,
u16 val);
void mv88e6xxx_ppu_state_init(struct dsa_switch *ds);
+void mv88e6xxx_ppu_state_remove(struct dsa_switch *ds);
int mv88e6xxx_phy_read_ppu(struct dsa_switch *ds, int addr, int regnum);
int mv88e6xxx_phy_write_ppu(struct dsa_switch *ds, int addr,
int regnum, u16 val);
--
1.9.1
next reply other threads:[~2015-10-28 14:13 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-28 14:13 Neil Armstrong [this message]
2015-10-28 14:35 ` [RFC PATCH v2 3/4] net: dsa: mv88e6xxx: add common and ppu remove function Andrew Lunn
2015-10-28 14:37 ` Neil Armstrong
2015-10-28 14:45 ` Andrew Lunn
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=5630D7FC.4010509@baylibre.com \
--to=narmstrong@baylibre$(echo .)com \
--cc=andrew@lunn$(echo .)ch \
--cc=davem@davemloft$(echo .)net \
--cc=f.fainelli@gmail$(echo .)com \
--cc=fabf@skynet$(echo .)be \
--cc=joe@perches$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux@roeck-us$(echo .)net \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pavel.nakonechny@skitlab$(echo .)ru \
--cc=vivien.didelot@savoirfairelinux$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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