| Message ID | 1540943149-26832-1-git-send-email-Tristram.Ha@microchip.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net] net: dsa: microchip: initialize mutex before use | expand |
On Tue, Oct 30, 2018 at 04:45:49PM -0700, Tristram.Ha@microchip.com wrote: > From: Tristram Ha <Tristram.Ha@microchip.com> > > Initialize mutex before use. Avoid kernel complaint when > CONFIG_DEBUG_LOCK_ALLOC is enabled. > > Fixes: b987e98e50ab90e5 ("dsa: add DSA switch driver for Microchip KSZ9477") > Signed-off-by: Tristram Ha <Tristram.Ha@microchip.com> > --- > drivers/net/dsa/microchip/ksz_common.c | 11 ++++++----- > 1 file changed, 6 insertions(+), 5 deletions(-) > > diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c > index 54e0ca6..f6f0662 100644 > --- a/drivers/net/dsa/microchip/ksz_common.c > +++ b/drivers/net/dsa/microchip/ksz_common.c > @@ -1117,11 +1117,6 @@ static int ksz_switch_init(struct ksz_device *dev) > { > int i; > > - mutex_init(&dev->reg_mutex); > - mutex_init(&dev->stats_mutex); > - mutex_init(&dev->alu_mutex); > - mutex_init(&dev->vlan_mutex); > - > dev->ds->ops = &ksz_switch_ops; > > for (i = 0; i < ARRAY_SIZE(ksz_switch_chips); i++) { > @@ -1206,6 +1201,12 @@ int ksz_switch_register(struct ksz_device *dev) > if (dev->pdata) > dev->chip_id = dev->pdata->chip_id; > > + /* mutex is used in next function call. */ > + mutex_init(&dev->reg_mutex); > + mutex_init(&dev->stats_mutex); > + mutex_init(&dev->alu_mutex); > + mutex_init(&dev->vlan_mutex); Hi Tristram The comment is no longer relevant now that all mutexes are initialised. Andrew
On Tue 2018-10-30 16:45:49, Tristram.Ha@microchip.com wrote: > From: Tristram Ha <Tristram.Ha@microchip.com> > > Initialize mutex before use. Avoid kernel complaint when > CONFIG_DEBUG_LOCK_ALLOC is enabled. > > Fixes: b987e98e50ab90e5 ("dsa: add DSA switch driver for Microchip KSZ9477") > Signed-off-by: Tristram Ha <Tristram.Ha@microchip.com> Acked-by: Pavel Machek <pavel@ucw.cz>
From: <Tristram.Ha@microchip.com> Date: Tue, 30 Oct 2018 16:45:49 -0700 > @@ -1206,6 +1201,12 @@ int ksz_switch_register(struct ksz_device *dev) > if (dev->pdata) > dev->chip_id = dev->pdata->chip_id; > > + /* mutex is used in next function call. */ > + mutex_init(&dev->reg_mutex); > + mutex_init(&dev->stats_mutex); > + mutex_init(&dev->alu_mutex); > + mutex_init(&dev->vlan_mutex); > + Please remove this comment, as per Andrew Lunn's feedback.
diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c index 54e0ca6..f6f0662 100644 --- a/drivers/net/dsa/microchip/ksz_common.c +++ b/drivers/net/dsa/microchip/ksz_common.c @@ -1117,11 +1117,6 @@ static int ksz_switch_init(struct ksz_device *dev) { int i; - mutex_init(&dev->reg_mutex); - mutex_init(&dev->stats_mutex); - mutex_init(&dev->alu_mutex); - mutex_init(&dev->vlan_mutex); - dev->ds->ops = &ksz_switch_ops; for (i = 0; i < ARRAY_SIZE(ksz_switch_chips); i++) { @@ -1206,6 +1201,12 @@ int ksz_switch_register(struct ksz_device *dev) if (dev->pdata) dev->chip_id = dev->pdata->chip_id; + /* mutex is used in next function call. */ + mutex_init(&dev->reg_mutex); + mutex_init(&dev->stats_mutex); + mutex_init(&dev->alu_mutex); + mutex_init(&dev->vlan_mutex); + if (ksz_switch_detect(dev)) return -EINVAL;