| Message ID | 87100999ebfd6e205e655a6355a3990ff89d3945.1639239996.git.objelf@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Felix Fietkau |
| Headers | show |
| Series | [1/2] mt76: mt7921s: make pm->suspended usage consistent | expand |
> From: Sean Wang <sean.wang@mediatek.com> > > Update pm->suspended usage to be consistent with mt7921e driver. > > Signed-off-by: Sean Wang <sean.wang@mediatek.com> > --- > drivers/net/wireless/mediatek/mt76/mt7921/sdio.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/sdio.c b/drivers/net/wireless/mediatek/mt76/mt7921/sdio.c > index 84be229a899d..44ee9369f6bf 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt7921/sdio.c > +++ b/drivers/net/wireless/mediatek/mt76/mt7921/sdio.c > @@ -278,7 +278,6 @@ static int mt7921s_resume(struct device *__dev) > struct mt76_dev *mdev = &dev->mt76; > int err; > > - pm->suspended = false; > clear_bit(MT76_STATE_SUSPEND, &mdev->phy.state); > > err = mt7921_mcu_drv_pmctrl(dev); > @@ -294,7 +293,11 @@ static int mt7921s_resume(struct device *__dev) > if (!pm->ds_enable) > mt76_connac_mcu_set_deep_sleep(mdev, false); > > - return mt76_connac_mcu_set_hif_suspend(mdev, false); > + err = mt76_connac_mcu_set_hif_suspend(mdev, false); should we check return value here? Something like: if (err) return err; pm->suspended = false; return 0; Or, is the chip up even if mt76_connac_mcu_set_hif_suspend() fails? > + > + pm->suspended = false; > + > + return err; > } > > static const struct dev_pm_ops mt7921s_pm_ops = { > -- > 2.25.1 >
diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/sdio.c b/drivers/net/wireless/mediatek/mt76/mt7921/sdio.c index 84be229a899d..44ee9369f6bf 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/sdio.c +++ b/drivers/net/wireless/mediatek/mt76/mt7921/sdio.c @@ -278,7 +278,6 @@ static int mt7921s_resume(struct device *__dev) struct mt76_dev *mdev = &dev->mt76; int err; - pm->suspended = false; clear_bit(MT76_STATE_SUSPEND, &mdev->phy.state); err = mt7921_mcu_drv_pmctrl(dev); @@ -294,7 +293,11 @@ static int mt7921s_resume(struct device *__dev) if (!pm->ds_enable) mt76_connac_mcu_set_deep_sleep(mdev, false); - return mt76_connac_mcu_set_hif_suspend(mdev, false); + err = mt76_connac_mcu_set_hif_suspend(mdev, false); + + pm->suspended = false; + + return err; } static const struct dev_pm_ops mt7921s_pm_ops = {