Commit 1681956c authored by Linus Walleij's avatar Linus Walleij
Browse files

Merge branch 'i2c/make_remove_callback_void-immutable' of... 

Merge branch 'i2c/make_remove_callback_void-immutable' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux

 into devel

This branch is needed to make the i2c driver remove() callback in new
driver compile properly.

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parents 0684bc79 ed5c2f5f

Documentation/i2c/writing-clients.rst

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ those devices, and a remove() method to unbind. 
::



	static int foo_probe(struct i2c_client *client);

	static int foo_remove(struct i2c_client *client);

	static void foo_remove(struct i2c_client *client);



Remember that the i2c_driver does not create those client handles.  The

handle may be used during foo_probe().  If foo_probe() reports success

arch/arm/mach-davinci/board-da850-evm.c

+4 −8
Original line number Diff line number Diff line
@@ -516,7 +516,7 @@ static int da850_evm_ui_expander_setup(struct i2c_client *client, unsigned gpio, 
	return ret;

}



static int da850_evm_ui_expander_teardown(struct i2c_client *client,

static void da850_evm_ui_expander_teardown(struct i2c_client *client,

					   unsigned gpio, unsigned ngpio, void *c)

{

	platform_device_unregister(&da850_evm_ui_keys_device);
@@ -529,8 +529,6 @@ static int da850_evm_ui_expander_teardown(struct i2c_client *client, 
	gpio_free(gpio + DA850_EVM_UI_EXP_SEL_C);

	gpio_free(gpio + DA850_EVM_UI_EXP_SEL_B);

	gpio_free(gpio + DA850_EVM_UI_EXP_SEL_A);



	return 0;

}



/* assign the baseboard expander's GPIOs after the UI board's */
@@ -697,13 +695,11 @@ static int da850_evm_bb_expander_setup(struct i2c_client *client, 
	return ret;

}



static int da850_evm_bb_expander_teardown(struct i2c_client *client,

static void da850_evm_bb_expander_teardown(struct i2c_client *client,

					   unsigned gpio, unsigned ngpio, void *c)

{

	platform_device_unregister(&da850_evm_bb_leds_device);

	platform_device_unregister(&da850_evm_bb_keys_device);



	return 0;

}



static struct pca953x_platform_data da850_evm_ui_expander_info = {

arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c

+1 −2
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ static int mcu_probe(struct i2c_client *client) 
	return ret;

}



static int mcu_remove(struct i2c_client *client)

static void mcu_remove(struct i2c_client *client)

{

	struct mcu *mcu = i2c_get_clientdata(client);
@@ -193,7 +193,6 @@ static int mcu_remove(struct i2c_client *client) 


	mcu_gpiochip_remove(mcu);

	kfree(mcu);

	return 0;

}



static const struct i2c_device_id mcu_ids[] = {

drivers/auxdisplay/ht16k33.c

+1 −3
Original line number Diff line number Diff line
@@ -775,7 +775,7 @@ static int ht16k33_probe(struct i2c_client *client) 
	return err;

}



static int ht16k33_remove(struct i2c_client *client)

static void ht16k33_remove(struct i2c_client *client)

{

	struct ht16k33_priv *priv = i2c_get_clientdata(client);

	struct ht16k33_fbdev *fbdev = &priv->fbdev;
@@ -796,8 +796,6 @@ static int ht16k33_remove(struct i2c_client *client) 
		device_remove_file(&client->dev, &dev_attr_map_seg14);

		break;

	}



	return 0;

}



static const struct i2c_device_id ht16k33_i2c_match[] = {

drivers/auxdisplay/lcd2s.c

+1 −2
Original line number Diff line number Diff line
@@ -340,13 +340,12 @@ static int lcd2s_i2c_probe(struct i2c_client *i2c) 
	return err;

}



static int lcd2s_i2c_remove(struct i2c_client *i2c)

static void lcd2s_i2c_remove(struct i2c_client *i2c)

{

	struct lcd2s_data *lcd2s = i2c_get_clientdata(i2c);



	charlcd_unregister(lcd2s->charlcd);

	charlcd_free(lcd2s->charlcd);

	return 0;

}



static const struct i2c_device_id lcd2s_i2c_id[] = {