Commit a1d5ce11 authored by Eddie James's avatar Eddie James Committed by Joel Stanley
Browse files

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: default avatarEddie James <eajames@linux.ibm.com>
Signed-off-by: default avatarJoel Stanley <joel@jms.id.au>
parent 196964a3
Loading
Loading
Loading
Loading
+1 −10
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ static int aspeed_master_link_enable(struct fsi_master *master, int link,
{
	struct fsi_master_aspeed *aspeed = to_fsi_master_aspeed(master);
	int idx, bit, ret;
	__be32 reg, result;
	__be32 reg;

	idx = link / 32;
	bit = link % 32;
@@ -323,15 +323,6 @@ static int aspeed_master_link_enable(struct fsi_master *master, int link,

	mdelay(FSI_LINK_ENABLE_SETUP_TIME);

	ret = opb_readl(aspeed, ctrl_base + FSI_MENP0 + (4 * idx), &result);
	if (ret)
		return ret;

	if (result != reg) {
		dev_err(aspeed->dev, "%s failed: %08x\n", __func__, result);
		return -EIO;
	}

	return 0;
}

+3 −3
Original line number Diff line number Diff line
@@ -95,12 +95,12 @@ static int hub_master_link_enable(struct fsi_master *master, int link,
					&reg, 4);

	rc = fsi_device_write(hub->upstream, FSI_MSENP0 + (4 * idx), &reg, 4);
	if (rc)
		return rc;

	mdelay(FSI_LINK_ENABLE_SETUP_TIME);

	fsi_device_read(hub->upstream, FSI_MENP0 + (4 * idx), &reg, 4);

	return rc;
	return 0;
}

static void hub_master_release(struct device *dev)