@@ -36,14 +36,14 @@ struct qcom_rng {
36
36
void __iomem * base ;
37
37
struct clk * clk ;
38
38
struct hwrng hwrng ;
39
- struct qcom_rng_of_data * of_data ;
39
+ struct qcom_rng_match_data * match_data ;
40
40
};
41
41
42
42
struct qcom_rng_ctx {
43
43
struct qcom_rng * rng ;
44
44
};
45
45
46
- struct qcom_rng_of_data {
46
+ struct qcom_rng_match_data {
47
47
bool skip_init ;
48
48
bool hwrng_support ;
49
49
};
@@ -155,7 +155,7 @@ static int qcom_rng_init(struct crypto_tfm *tfm)
155
155
156
156
ctx -> rng = qcom_rng_dev ;
157
157
158
- if (!ctx -> rng -> of_data -> skip_init )
158
+ if (!ctx -> rng -> match_data -> skip_init )
159
159
return qcom_rng_enable (ctx -> rng );
160
160
161
161
return 0 ;
@@ -196,7 +196,7 @@ static int qcom_rng_probe(struct platform_device *pdev)
196
196
if (IS_ERR (rng -> clk ))
197
197
return PTR_ERR (rng -> clk );
198
198
199
- rng -> of_data = (struct qcom_rng_of_data * )device_get_match_data (& pdev -> dev );
199
+ rng -> match_data = (struct qcom_rng_match_data * )device_get_match_data (& pdev -> dev );
200
200
201
201
qcom_rng_dev = rng ;
202
202
ret = crypto_register_rng (& qcom_rng_alg );
@@ -206,7 +206,7 @@ static int qcom_rng_probe(struct platform_device *pdev)
206
206
return ret ;
207
207
}
208
208
209
- if (rng -> of_data -> hwrng_support ) {
209
+ if (rng -> match_data -> hwrng_support ) {
210
210
rng -> hwrng .name = "qcom_hwrng" ;
211
211
rng -> hwrng .read = qcom_hwrng_read ;
212
212
rng -> hwrng .quality = QCOM_TRNG_QUALITY ;
@@ -231,31 +231,31 @@ static void qcom_rng_remove(struct platform_device *pdev)
231
231
qcom_rng_dev = NULL ;
232
232
}
233
233
234
- static struct qcom_rng_of_data qcom_prng_of_data = {
234
+ static struct qcom_rng_match_data qcom_prng_match_data = {
235
235
.skip_init = false,
236
236
.hwrng_support = false,
237
237
};
238
238
239
- static struct qcom_rng_of_data qcom_prng_ee_of_data = {
239
+ static struct qcom_rng_match_data qcom_prng_ee_match_data = {
240
240
.skip_init = true,
241
241
.hwrng_support = false,
242
242
};
243
243
244
- static struct qcom_rng_of_data qcom_trng_of_data = {
244
+ static struct qcom_rng_match_data qcom_trng_match_data = {
245
245
.skip_init = true,
246
246
.hwrng_support = true,
247
247
};
248
248
249
249
static const struct acpi_device_id __maybe_unused qcom_rng_acpi_match [] = {
250
- { .id = "QCOM8160" , .driver_data = (kernel_ulong_t )& qcom_prng_ee_of_data },
250
+ { .id = "QCOM8160" , .driver_data = (kernel_ulong_t )& qcom_prng_ee_match_data },
251
251
{}
252
252
};
253
253
MODULE_DEVICE_TABLE (acpi , qcom_rng_acpi_match );
254
254
255
255
static const struct of_device_id __maybe_unused qcom_rng_of_match [] = {
256
- { .compatible = "qcom,prng" , .data = & qcom_prng_of_data },
257
- { .compatible = "qcom,prng-ee" , .data = & qcom_prng_ee_of_data },
258
- { .compatible = "qcom,trng" , .data = & qcom_trng_of_data },
256
+ { .compatible = "qcom,prng" , .data = & qcom_prng_match_data },
257
+ { .compatible = "qcom,prng-ee" , .data = & qcom_prng_ee_match_data },
258
+ { .compatible = "qcom,trng" , .data = & qcom_trng_match_data },
259
259
{}
260
260
};
261
261
MODULE_DEVICE_TABLE (of , qcom_rng_of_match );
0 commit comments