Commit 6c9100ea authored by Stephen Kitt's avatar Stephen Kitt Committed by Michael Ellerman
Browse files

powerpc: Use simple i2c probe function 



The i2c probe functions here don't use the id information provided in
their second argument, so the single-parameter i2c probe
function ("probe_new") can be used instead.

This avoids scanning the identifier tables during probes.

Signed-off-by: default avatarStephen Kitt <steve@sk2.org>
Acked-by: default avatarWolfram Sang <wsa@kernel.org>
Reviewed-by: default avatarLuca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200807152713.381588-1-steve@sk2.org
parent 5d1bc776

arch/powerpc/platforms/44x/ppc476.c

+2 −3
Original line number Diff line number Diff line
@@ -86,8 +86,7 @@ static void __noreturn avr_reset_system(char *cmd) 
	avr_halt_system(AVR_PWRCTL_RESET);

}



static int avr_probe(struct i2c_client *client,

			    const struct i2c_device_id *id)

static int avr_probe(struct i2c_client *client)

{

	avr_i2c_client = client;

	ppc_md.restart = avr_reset_system;
@@ -104,7 +103,7 @@ static struct i2c_driver avr_driver = { 
	.driver = {

		.name = "akebono-avr",

	},

	.probe = avr_probe,

	.probe_new = avr_probe,

	.id_table = avr_id,

};

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

+2 −2
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ static int mcu_gpiochip_remove(struct mcu *mcu) 
	return 0;

}



static int mcu_probe(struct i2c_client *client, const struct i2c_device_id *id)

static int mcu_probe(struct i2c_client *client)

{

	struct mcu *mcu;

	int ret;
@@ -221,7 +221,7 @@ static struct i2c_driver mcu_driver = { 
		.name = "mcu-mpc8349emitx",

		.of_match_table = mcu_of_match_table,

	},

	.probe = mcu_probe,

	.probe_new = mcu_probe,

	.remove	= mcu_remove,

	.id_table = mcu_ids,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE