diff options
| author | David Howells <dhowells@redhat.com> | 2008-02-07 11:15:26 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-07 19:42:26 +0300 |
| commit | e231c2ee64eb1c5cd3c63c31da9dac7d888dcf7f (patch) | |
| tree | d4b17ef65960594681397a3acac02c2d248200b5 /crypto | |
| parent | d1bc8e95445224276d7896b8b08cbb0b28a0ca80 (diff) | |
| download | linux-e231c2ee64eb1c5cd3c63c31da9dac7d888dcf7f.tar.xz | |
Convert ERR_PTR(PTR_ERR(p)) instances to ERR_CAST(p)
Convert instances of ERR_PTR(PTR_ERR(p)) to ERR_CAST(p) using:
perl -spi -e 's/ERR_PTR[(]PTR_ERR[(](.*)[)][)]/ERR_CAST(\1)/' `grep -rl 'ERR_PTR[(]*PTR_ERR' fs crypto net security`
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/cbc.c | 2 | ||||
| -rw-r--r-- | crypto/cryptd.c | 4 | ||||
| -rw-r--r-- | crypto/ecb.c | 2 | ||||
| -rw-r--r-- | crypto/hmac.c | 2 | ||||
| -rw-r--r-- | crypto/lrw.c | 2 | ||||
| -rw-r--r-- | crypto/pcbc.c | 2 | ||||
| -rw-r--r-- | crypto/xcbc.c | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/crypto/cbc.c b/crypto/cbc.c index 6affff882cf8..61ac42e1e32b 100644 --- a/crypto/cbc.c +++ b/crypto/cbc.c @@ -224,7 +224,7 @@ static struct crypto_instance *crypto_cbc_alloc(struct rtattr **tb) alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_CIPHER, CRYPTO_ALG_TYPE_MASK); if (IS_ERR(alg)) - return ERR_PTR(PTR_ERR(alg)); + return ERR_CAST(alg); inst = ERR_PTR(-EINVAL); if (!is_power_of_2(alg->cra_blocksize)) diff --git a/crypto/cryptd.c b/crypto/cryptd.c index 074298f2f8e3..250425263e00 100644 --- a/crypto/cryptd.c +++ b/crypto/cryptd.c @@ -230,7 +230,7 @@ static struct crypto_instance *cryptd_alloc_blkcipher( alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_BLKCIPHER, CRYPTO_ALG_TYPE_MASK); if (IS_ERR(alg)) - return ERR_PTR(PTR_ERR(alg)); + return ERR_CAST(alg); inst = cryptd_alloc_instance(alg, state); if (IS_ERR(inst)) @@ -267,7 +267,7 @@ static struct crypto_instance *cryptd_alloc(struct rtattr **tb) algt = crypto_get_attr_type(tb); if (IS_ERR(algt)) - return ERR_PTR(PTR_ERR(algt)); + return ERR_CAST(algt); switch (algt->type & algt->mask & CRYPTO_ALG_TYPE_MASK) { case CRYPTO_ALG_TYPE_BLKCIPHER: diff --git a/crypto/ecb.c b/crypto/ecb.c index 6310387a872c..a46838e98a71 100644 --- a/crypto/ecb.c +++ b/crypto/ecb.c @@ -128,7 +128,7 @@ static struct crypto_instance *crypto_ecb_alloc(struct rtattr **tb) alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_CIPHER, CRYPTO_ALG_TYPE_MASK); if (IS_ERR(alg)) - return ERR_PTR(PTR_ERR(alg)); + return ERR_CAST(alg); inst = crypto_alloc_instance("ecb", alg); if (IS_ERR(inst)) diff --git a/crypto/hmac.c b/crypto/hmac.c index a1d016a50e7d..b60c3c7aa320 100644 --- a/crypto/hmac.c +++ b/crypto/hmac.c @@ -213,7 +213,7 @@ static struct crypto_instance *hmac_alloc(struct rtattr **tb) alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_HASH, CRYPTO_ALG_TYPE_HASH_MASK); if (IS_ERR(alg)) - return ERR_PTR(PTR_ERR(alg)); + return ERR_CAST(alg); inst = crypto_alloc_instance("hmac", alg); if (IS_ERR(inst)) diff --git a/crypto/lrw.c b/crypto/lrw.c index 621095db28b3..9d52e580d10a 100644 --- a/crypto/lrw.c +++ b/crypto/lrw.c @@ -241,7 +241,7 @@ static struct crypto_instance *alloc(struct rtattr **tb) alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_CIPHER, CRYPTO_ALG_TYPE_MASK); if (IS_ERR(alg)) - return ERR_PTR(PTR_ERR(alg)); + return ERR_CAST(alg); inst = crypto_alloc_instance("lrw", alg); if (IS_ERR(inst)) diff --git a/crypto/pcbc.c b/crypto/pcbc.c index fe704775f88f..d1b8bdfb5855 100644 --- a/crypto/pcbc.c +++ b/crypto/pcbc.c @@ -234,7 +234,7 @@ static struct crypto_instance *crypto_pcbc_alloc(struct rtattr **tb) alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_CIPHER, CRYPTO_ALG_TYPE_MASK); if (IS_ERR(alg)) - return ERR_PTR(PTR_ERR(alg)); + return ERR_CAST(alg); inst = crypto_alloc_instance("pcbc", alg); if (IS_ERR(inst)) diff --git a/crypto/xcbc.c b/crypto/xcbc.c index a82959df678c..86727403e5ab 100644 --- a/crypto/xcbc.c +++ b/crypto/xcbc.c @@ -301,7 +301,7 @@ static struct crypto_instance *xcbc_alloc(struct rtattr **tb) alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_CIPHER, CRYPTO_ALG_TYPE_MASK); if (IS_ERR(alg)) - return ERR_PTR(PTR_ERR(alg)); + return ERR_CAST(alg); switch(alg->cra_blocksize) { case 16: |