Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15e0964d authored by Jingoo Han's avatar Jingoo Han Committed by Mark Brown
Browse files

spi: sc18is602: Use devm_spi_register_master() 



Use devm_spi_register_master() to make cleanup paths simpler,
and remove unnecessary remove().

Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Acked-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 6ce4eac1

drivers/spi/spi-sc18is602.c

+1 −12
Original line number Original line Diff line number Diff line
@@ -319,7 +319,7 @@ static int sc18is602_probe(struct i2c_client *client, 
	master->transfer_one_message = sc18is602_transfer_one;

	master->transfer_one_message = sc18is602_transfer_one;

	master->dev.of_node = np;

	master->dev.of_node = np;





	error = spi_register_master(master);

	error = devm_spi_register_master(dev, master);

	if (error)

	if (error)

		goto error_reg;

		goto error_reg;
@@ -330,16 +330,6 @@ static int sc18is602_probe(struct i2c_client *client, 
	return error;

	return error;

}

}





static int sc18is602_remove(struct i2c_client *client)

{

	struct sc18is602 *hw = i2c_get_clientdata(client);

	struct spi_master *master = hw->master;



	spi_unregister_master(master);



	return 0;

}



static const struct i2c_device_id sc18is602_id[] = {

static const struct i2c_device_id sc18is602_id[] = {

	{ "sc18is602", sc18is602 },

	{ "sc18is602", sc18is602 },

	{ "sc18is602b", sc18is602b },

	{ "sc18is602b", sc18is602b },
@@ -353,7 +343,6 @@ static struct i2c_driver sc18is602_driver = { 
		.name = "sc18is602",

		.name = "sc18is602",

	},

	},

	.probe = sc18is602_probe,

	.probe = sc18is602_probe,

	.remove = sc18is602_remove,

	.id_table = sc18is602_id,

	.id_table = sc18is602_id,

};

};