summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--crypto/pcrypt.c3
-rw-r--r--include/linux/padata.h1
-rw-r--r--kernel/padata.c26
3 files changed, 1 insertions, 29 deletions
diff --git a/crypto/pcrypt.c b/crypto/pcrypt.c
index cbc383a1a3fe..fb9127ec5357 100644
--- a/crypto/pcrypt.c
+++ b/crypto/pcrypt.c
@@ -355,9 +355,6 @@ static int __init pcrypt_init(void)
if (err)
goto err_deinit_pencrypt;
- padata_start(pencrypt);
- padata_start(pdecrypt);
-
return crypto_register_template(&pcrypt_tmpl);
err_deinit_pencrypt:
diff --git a/include/linux/padata.h b/include/linux/padata.h
index 7302efff5e65..20294cddc739 100644
--- a/include/linux/padata.h
+++ b/include/linux/padata.h
@@ -204,6 +204,5 @@ extern void padata_do_serial(struct padata_priv *padata);
extern void __init padata_do_multithreaded(struct padata_mt_job *job);
extern int padata_set_cpumask(struct padata_instance *pinst, int cpumask_type,
cpumask_var_t cpumask);
-extern int padata_start(struct padata_instance *pinst);
extern void padata_stop(struct padata_instance *pinst);
#endif
diff --git a/kernel/padata.c b/kernel/padata.c
index 4373f7adaa40..931762316612 100644
--- a/kernel/padata.c
+++ b/kernel/padata.c
@@ -790,30 +790,6 @@ out:
EXPORT_SYMBOL(padata_set_cpumask);
/**
- * padata_start - start the parallel processing
- *
- * @pinst: padata instance to start
- *
- * Return: 0 on success or negative error code
- */
-int padata_start(struct padata_instance *pinst)
-{
- int err = 0;
-
- mutex_lock(&pinst->lock);
-
- if (pinst->flags & PADATA_INVALID)
- err = -EINVAL;
-
- __padata_start(pinst);
-
- mutex_unlock(&pinst->lock);
-
- return err;
-}
-EXPORT_SYMBOL(padata_start);
-
-/**
* padata_stop - stop the parallel processing
*
* @pinst: padata instance to stop
@@ -1100,7 +1076,7 @@ static struct padata_instance *padata_alloc(const char *name,
if (padata_setup_cpumasks(pinst))
goto err_free_rcpumask_cbcpu;
- pinst->flags = 0;
+ __padata_start(pinst);
kobject_init(&pinst->kobj, &padata_attr_type);
mutex_init(&pinst->lock);