diff options
Diffstat (limited to 'drivers/crypto/caam/jr.c')
| -rw-r--r-- | drivers/crypto/caam/jr.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/crypto/caam/jr.c b/drivers/crypto/caam/jr.c index 70e016486a..b5d70b24b3 100644 --- a/drivers/crypto/caam/jr.c +++ b/drivers/crypto/caam/jr.c @@ -22,7 +22,7 @@ #include "desc.h" #include "intern.h" -static int caam_reset_hw_jr(struct device_d *dev) +static int caam_reset_hw_jr(struct device *dev) { struct caam_drv_private_jr *jrp = dev->priv; uint64_t start; @@ -59,7 +59,7 @@ static int caam_reset_hw_jr(struct device_d *dev) static int caam_jr_dequeue(struct caam_drv_private_jr *jrp) { int hw_idx, sw_idx, i, head, tail; - void (*usercall)(struct device_d *dev, u32 *desc, u32 status, void *arg); + void (*usercall)(struct device *dev, u32 *desc, u32 status, void *arg); u32 *userdesc, userstatus; void *userarg; int found; @@ -183,8 +183,8 @@ static int caam_jr_interrupt(struct caam_drv_private_jr *jrp) * @areq: optional pointer to a user argument for use at callback * time. **/ -int caam_jr_enqueue(struct device_d *dev, u32 *desc, - void (*cbk)(struct device_d *dev, u32 *desc, +int caam_jr_enqueue(struct device *dev, u32 *desc, + void (*cbk)(struct device *dev, u32 *desc, u32 status, void *areq), void *areq) { @@ -207,7 +207,7 @@ int caam_jr_enqueue(struct device_d *dev, u32 *desc, } head_entry = &jrp->entinfo[head]; - head_entry->desc_addr_virt = phys_to_virt((u32) desc); + head_entry->desc_addr_virt = desc; head_entry->desc_size = desc_size; head_entry->callbk = (void *)cbk; head_entry->cbkarg = areq; @@ -237,7 +237,7 @@ EXPORT_SYMBOL(caam_jr_enqueue); /* * Init JobR independent of platform property detection */ -static int caam_jr_init(struct device_d *dev) +static int caam_jr_init(struct device *dev) { struct caam_drv_private_jr *jrp; dma_addr_t dma_inpring; @@ -287,9 +287,8 @@ static int caam_jr_init(struct device_d *dev) /* * Probe routine for each detected JobR subsystem. */ -int caam_jr_probe(struct device_d *dev) +int caam_jr_probe(struct device *dev) { - struct device_node *nprop; struct caam_job_ring __iomem *ctrl; struct caam_drv_private_jr *jrpriv; static int total_jobrs; @@ -303,7 +302,6 @@ int caam_jr_probe(struct device_d *dev) /* save ring identity relative to detection */ jrpriv->ridx = total_jobrs++; - nprop = dev->device_node; /* Get configuration properties from device tree */ /* First, get register page */ ctrl = dev_get_mem_region(dev, 0); |