i2c: opal: make use of the new infrastructure for quirks (a531afdf) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/i2c/busses/i2c-opal.c

+11 −11

Original line number	Diff line number	Diff line
		@@ -104,17 +104,6 @@ static int i2c_opal_master_xfer(struct i2c_adapter adap, struct i2c_msg msgs,
		req.buffer_ra = cpu_to_be64(__pa(msgs[0].buf));
		break;
		case 2:
		/* For two messages, we basically support only simple
		* smbus transactions of a write plus a read. We might
		* want to allow also two writes but we'd have to bounce
		* the data into a single buffer.
		*/
		if ((msgs[0].flags & I2C_M_RD) \|\| !(msgs[1].flags & I2C_M_RD))
		return -EOPNOTSUPP;
		if (msgs[0].len > 4)
		return -EOPNOTSUPP;
		if (msgs[0].addr != msgs[1].addr)
		return -EOPNOTSUPP;
		req.type = OPAL_I2C_SM_READ;
		req.addr = cpu_to_be16(msgs[0].addr);
		req.subaddr_sz = msgs[0].len;
		@@ -210,6 +199,16 @@ static const struct i2c_algorithm i2c_opal_algo = {
		.functionality = i2c_opal_func,
		};

		/* For two messages, we basically support only simple
		* smbus transactions of a write plus a read. We might
		* want to allow also two writes but we'd have to bounce
		* the data into a single buffer.
		*/
		static struct i2c_adapter_quirks i2c_opal_quirks = {
		.flags = I2C_AQ_COMB_WRITE_THEN_READ,
		.max_comb_1st_msg_len = 4,
		};

		static int i2c_opal_probe(struct platform_device *pdev)
		{
		struct i2c_adapter *adapter;
		@@ -232,6 +231,7 @@ static int i2c_opal_probe(struct platform_device *pdev)

		adapter->algo = &i2c_opal_algo;
		adapter->algo_data = (void *)(unsigned long)opal_id;
		adapter->quirks = &i2c_opal_quirks;
		adapter->dev.parent = &pdev->dev;
		adapter->dev.of_node = of_node_get(pdev->dev.of_node);
		pname = of_get_property(pdev->dev.of_node, "ibm,port-name", NULL);