Skip to content

Commit 5e9151c

Browse files
ukleinekjenswi-linaro
authored andcommitted
hwrng: optee - Make use of tee bus methods
The tee bus got dedicated callbacks for probe and remove. Make use of these. This fixes a runtime warning about the driver needing to be converted to the bus methods. Reviewed-by: Sumit Garg <sumit.garg@oss.qualcomm.com> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com> Acked-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
1 parent 21ecfe4 commit 5e9151c

1 file changed

Lines changed: 5 additions & 7 deletions

File tree

drivers/char/hw_random/optee-rng.c

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -211,9 +211,9 @@ static int optee_ctx_match(struct tee_ioctl_version_data *ver, const void *data)
211211
return 0;
212212
}
213213

214-
static int optee_rng_probe(struct device *dev)
214+
static int optee_rng_probe(struct tee_client_device *rng_device)
215215
{
216-
struct tee_client_device *rng_device = to_tee_client_device(dev);
216+
struct device *dev = &rng_device->dev;
217217
int ret = 0, err = -ENODEV;
218218
struct tee_ioctl_open_session_arg sess_arg;
219219

@@ -261,12 +261,10 @@ static int optee_rng_probe(struct device *dev)
261261
return err;
262262
}
263263

264-
static int optee_rng_remove(struct device *dev)
264+
static void optee_rng_remove(struct tee_client_device *tee_dev)
265265
{
266266
tee_client_close_session(pvt_data.ctx, pvt_data.session_id);
267267
tee_client_close_context(pvt_data.ctx);
268-
269-
return 0;
270268
}
271269

272270
static const struct tee_client_device_id optee_rng_id_table[] = {
@@ -278,11 +276,11 @@ static const struct tee_client_device_id optee_rng_id_table[] = {
278276
MODULE_DEVICE_TABLE(tee, optee_rng_id_table);
279277

280278
static struct tee_client_driver optee_rng_driver = {
279+
.probe = optee_rng_probe,
280+
.remove = optee_rng_remove,
281281
.id_table = optee_rng_id_table,
282282
.driver = {
283283
.name = DRIVER_NAME,
284-
.probe = optee_rng_probe,
285-
.remove = optee_rng_remove,
286284
},
287285
};
288286

0 commit comments

Comments
 (0)