Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux (7dc6fd0f) · Commits · 戴 / test

MAINTAINERS

+2 −1

Original line number	Diff line number	Diff line
		@@ -14188,7 +14188,8 @@ F: Documentation/devicetree/bindings/net/qcom,ethqos.txt
		F: drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c

		QUALCOMM GENERIC INTERFACE I2C DRIVER
		M: Alok Chauhan <alokc@codeaurora.org>
		M: Akash Asthana <akashast@codeaurora.org>
		M: Mukesh Savaliya <msavaliy@codeaurora.org>
		L: linux-i2c@vger.kernel.org
		L: linux-arm-msm@vger.kernel.org
		S: Supported

+4 −3

Original line number	Diff line number	Diff line
		@@ -18,10 +18,8 @@ int i2c_slave_register(struct i2c_client *client, i2c_slave_cb_t slave_cb)
		{
		int ret;

		if (!client \|\| !slave_cb) {
		WARN(1, "insufficient data\n");
		if (WARN(IS_ERR_OR_NULL(client) \|\| !slave_cb, "insufficient data\n"))
		return -EINVAL;
		}

		if (!(client->flags & I2C_CLIENT_SLAVE))
		dev_warn(&client->dev, "%s: client slave flag not set. You might see address collisions\n",
		@@ -60,6 +58,9 @@ int i2c_slave_unregister(struct i2c_client *client)
		{
		int ret;

		if (IS_ERR_OR_NULL(client))
		return -EINVAL;

		if (!client->adapter->algo->unreg_slave) {
		dev_err(&client->dev, "%s: not supported by adapter\n", __func__);
		return -EOPNOTSUPP;

+1 −1

Original line number	Diff line number	Diff line
		@@ -1001,7 +1001,7 @@ static inline u32 i2c_acpi_find_bus_speed(struct device *dev)
		static inline struct i2c_client i2c_acpi_new_device(struct device dev,
		int index, struct i2c_board_info *info)
		{
		return NULL;
		return ERR_PTR(-ENODEV);
		}
		static inline struct i2c_adapter *i2c_acpi_find_adapter_by_handle(acpi_handle handle)
		{