crypto: Rename struct device_private to bcm_device_private
Subsystems (4)
Jiri Olsa
reviewerPATCH 1/1 crypto: Rename struct device_private to bcm_device_private
Renaming 'struct device_private' to 'struct bcm_device_private', because it clashes with 'struct device_private' from 'drivers/base/base.h'.
While it's not a functional problem, it's causing two distinct type hierarchies in BTF data. It also breaks build with options:
CONFIG_DEBUG_INFO_BTF=y
CONFIG_CRYPTO_DEV_BCM_SPU=y
as reported by Qais Yousef [1].
[1] https://lore.kernel.org/lkml/20201229151352.6hzmjvu3qh6p2qgg@e107158-lin/
--- drivers/crypto/bcm/cipher.c | 2 +- drivers/crypto/bcm/cipher.h | 4 ++-- drivers/crypto/bcm/util.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
drivers/crypto/bcm/cipher.c +1 -1
@@ -42,7 +42,7 @@/* ================= Device Structure ================== */ -struct device_private iproc_priv; +struct bcm_device_private iproc_priv;/* ==================== Parameters ===================== */
drivers/crypto/bcm/cipher.h +2 -2
@@ -420,7 +420,7 @@ struct spu_hw {u32 num_chan; }; -struct device_private { +struct bcm_device_private {struct platform_device *pdev;struct spu_hw spu;
@@ -467,6 +467,6 @@ struct device_private { struct mbox_chan **mbox; }; -extern struct device_private iproc_priv; +extern struct bcm_device_private iproc_priv;#endif
drivers/crypto/bcm/util.c +1 -1
@@ -348,7 +348,7 @@ char *spu_alg_name(enum spu_cipher_alg alg, enum spu_cipher_mode mode)static ssize_t spu_debugfs_read (struct file *filp,char __user *ubuf,size_t count,loff_t *offp) { -struct device_private *ipriv; +struct bcm_device_private *ipriv;char *buf;ssize_t ret, out_offset, out_count;int i;
Signature · 1 line
2.26.2
Quoted 11 lines · Jiri Olsa
Renaming 'struct
device_private' to 'structbcm_device_private', because it clashes with 'structdevice_private' from 'drivers/base/base.h'.While it's not a functional problem, it's causing two distinct type hierarchies in BTF data. It also breaks build with options:
CONFIG_DEBUG_INFO_BTF=y
CONFIG_CRYPTO_DEV_BCM_SPU=yas reported by Qais Yousef [1].
Quoted 7 lines
[1] https://lore.kernel.org/lkml/20201229151352.6hzmjvu3qh6p2qgg@e107158-lin/
Signed-off-by Jiri Olsa <[email protected]>--- drivers/crypto/bcm/cipher.c | 2 +- drivers/crypto/bcm/cipher.h | 4 ++-- drivers/crypto/bcm/util.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
FWIW, I did reproduce this on v5.9 and v5.10 kernels too, worth adding a fixes tag for stable to pick it up? v5.8 built fine when I tried.
Anyway, the patch looks good to me, thanks for the fix!
Cheers
--
Qais Yousef
Herbert Xu
maintainerQuoted 11 lines · Jiri Olsa
Renaming 'struct
device_private' to 'structbcm_device_private', because it clashes with 'structdevice_private' from 'drivers/base/base.h'.While it's not a functional problem, it's causing two distinct type hierarchies in BTF data. It also breaks build with options:
CONFIG_DEBUG_INFO_BTF=y
CONFIG_CRYPTO_DEV_BCM_SPU=yas reported by Qais Yousef [1].
Quoted 7 lines
[1] https://lore.kernel.org/lkml/20201229151352.6hzmjvu3qh6p2qgg@e107158-lin/
Signed-off-by Jiri Olsa <[email protected]>--- drivers/crypto/bcm/cipher.c | 2 +- drivers/crypto/bcm/cipher.h | 4 ++-- drivers/crypto/bcm/util.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
Patch applied. Thanks.
Signature · 3 lines
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt