Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

crypto: bcm - 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/

Fixes: 9d12ba86f818 ("crypto: brcm - Add Broadcom SPU driver")
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Tested-by: Qais Yousef <qais.yousef@arm.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

authored by

Jiri Olsa and committed by
Herbert Xu
f7f2b43e e48767c1

+4 -4
+1 -1
drivers/crypto/bcm/cipher.c
··· 42 42 43 43 /* ================= Device Structure ================== */ 44 44 45 - struct device_private iproc_priv; 45 + struct bcm_device_private iproc_priv; 46 46 47 47 /* ==================== Parameters ===================== */ 48 48
+2 -2
drivers/crypto/bcm/cipher.h
··· 420 420 u32 num_chan; 421 421 }; 422 422 423 - struct device_private { 423 + struct bcm_device_private { 424 424 struct platform_device *pdev; 425 425 426 426 struct spu_hw spu; ··· 467 467 struct mbox_chan **mbox; 468 468 }; 469 469 470 - extern struct device_private iproc_priv; 470 + extern struct bcm_device_private iproc_priv; 471 471 472 472 #endif
+1 -1
drivers/crypto/bcm/util.c
··· 348 348 static ssize_t spu_debugfs_read(struct file *filp, char __user *ubuf, 349 349 size_t count, loff_t *offp) 350 350 { 351 - struct device_private *ipriv; 351 + struct bcm_device_private *ipriv; 352 352 char *buf; 353 353 ssize_t ret, out_offset, out_count; 354 354 int i;