diff options
| author | David S. Miller <davem@davemloft.net> | 2020-01-20 00:10:04 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-01-20 00:10:04 +0300 |
| commit | b3f7e3f23a763ccaae7b52d88d2c91e66c80d406 (patch) | |
| tree | e00e90eb161305ed9895315ba12e30ac17de9523 /drivers/phy/motorola/phy-mapphone-mdm6600.c | |
| parent | 4ee9e6e027c06eb1dd1cdbe025d461e407ece755 (diff) | |
| parent | 7008ee121089b8193aea918b98850fe87d996508 (diff) | |
| download | linux-b3f7e3f23a763ccaae7b52d88d2c91e66c80d406.tar.xz | |
Merge ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net
Diffstat (limited to 'drivers/phy/motorola/phy-mapphone-mdm6600.c')
| -rw-r--r-- | drivers/phy/motorola/phy-mapphone-mdm6600.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/phy/motorola/phy-mapphone-mdm6600.c b/drivers/phy/motorola/phy-mapphone-mdm6600.c index ee184d5607bd..f20524f0c21d 100644 --- a/drivers/phy/motorola/phy-mapphone-mdm6600.c +++ b/drivers/phy/motorola/phy-mapphone-mdm6600.c @@ -200,7 +200,7 @@ static void phy_mdm6600_status(struct work_struct *work) struct phy_mdm6600 *ddata; struct device *dev; DECLARE_BITMAP(values, PHY_MDM6600_NR_STATUS_LINES); - int error, i, val = 0; + int error; ddata = container_of(work, struct phy_mdm6600, status_work.work); dev = ddata->dev; @@ -212,16 +212,11 @@ static void phy_mdm6600_status(struct work_struct *work) if (error) return; - for (i = 0; i < PHY_MDM6600_NR_STATUS_LINES; i++) { - val |= test_bit(i, values) << i; - dev_dbg(ddata->dev, "XXX %s: i: %i values[i]: %i val: %i\n", - __func__, i, test_bit(i, values), val); - } - ddata->status = values[0]; + ddata->status = values[0] & ((1 << PHY_MDM6600_NR_STATUS_LINES) - 1); dev_info(dev, "modem status: %i %s\n", ddata->status, - phy_mdm6600_status_name[ddata->status & 7]); + phy_mdm6600_status_name[ddata->status]); complete(&ddata->ack); } |