Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

fsi: master: Remove link enable read-back

Both the Aspeed and hub masters read back the link enable register
after enabling the link, but this is unnecessary, so remove it.

Signed-off-by: Eddie James <eajames@linux.ibm.com>
Signed-off-by: Joel Stanley <joel@jms.id.au>

authored by

Eddie James and committed by
Joel Stanley
a1d5ce11 196964a3

+4 -13
+1 -10
drivers/fsi/fsi-master-aspeed.c
··· 306 306 { 307 307 struct fsi_master_aspeed *aspeed = to_fsi_master_aspeed(master); 308 308 int idx, bit, ret; 309 - __be32 reg, result; 309 + __be32 reg; 310 310 311 311 idx = link / 32; 312 312 bit = link % 32; ··· 322 322 return ret; 323 323 324 324 mdelay(FSI_LINK_ENABLE_SETUP_TIME); 325 - 326 - ret = opb_readl(aspeed, ctrl_base + FSI_MENP0 + (4 * idx), &result); 327 - if (ret) 328 - return ret; 329 - 330 - if (result != reg) { 331 - dev_err(aspeed->dev, "%s failed: %08x\n", __func__, result); 332 - return -EIO; 333 - } 334 325 335 326 return 0; 336 327 }
+3 -3
drivers/fsi/fsi-master-hub.c
··· 95 95 &reg, 4); 96 96 97 97 rc = fsi_device_write(hub->upstream, FSI_MSENP0 + (4 * idx), &reg, 4); 98 + if (rc) 99 + return rc; 98 100 99 101 mdelay(FSI_LINK_ENABLE_SETUP_TIME); 100 102 101 - fsi_device_read(hub->upstream, FSI_MENP0 + (4 * idx), &reg, 4); 102 - 103 - return rc; 103 + return 0; 104 104 } 105 105 106 106 static void hub_master_release(struct device *dev)