mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux next
Pull changes from Freescale SoC drivers tree that are required by subsequent caam/qi2 patches.
This commit is contained in:
commit
9dd24d4ef3
11 changed files with 131 additions and 30 deletions
|
|
@ -4502,7 +4502,7 @@ static int __cold dpaa2_dpseci_dpio_setup(struct dpaa2_caam_priv *priv)
|
|||
nctx->cb = dpaa2_caam_fqdan_cb;
|
||||
|
||||
/* Register notification callbacks */
|
||||
err = dpaa2_io_service_register(NULL, nctx);
|
||||
err = dpaa2_io_service_register(NULL, nctx, dev);
|
||||
if (unlikely(err)) {
|
||||
dev_dbg(dev, "No affine DPIO for cpu %d\n", cpu);
|
||||
nctx->cb = NULL;
|
||||
|
|
@ -4535,7 +4535,7 @@ err:
|
|||
ppriv = per_cpu_ptr(priv->ppriv, cpu);
|
||||
if (!ppriv->nctx.cb)
|
||||
break;
|
||||
dpaa2_io_service_deregister(NULL, &ppriv->nctx);
|
||||
dpaa2_io_service_deregister(NULL, &ppriv->nctx, dev);
|
||||
}
|
||||
|
||||
for_each_online_cpu(cpu) {
|
||||
|
|
@ -4555,7 +4555,7 @@ static void __cold dpaa2_dpseci_dpio_free(struct dpaa2_caam_priv *priv)
|
|||
|
||||
for_each_online_cpu(cpu) {
|
||||
ppriv = per_cpu_ptr(priv->ppriv, cpu);
|
||||
dpaa2_io_service_deregister(NULL, &ppriv->nctx);
|
||||
dpaa2_io_service_deregister(NULL, &ppriv->nctx, priv->dev);
|
||||
dpaa2_io_store_destroy(ppriv->store);
|
||||
|
||||
if (++i == priv->num_pairs)
|
||||
|
|
|
|||
Loading…
Reference in a new issue