Commit f7f2b43e authored by Jiri Olsa's avatar Jiri Olsa Committed by Herbert Xu

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: 9d12ba86 ("crypto: brcm - Add Broadcom SPU driver")
Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Tested-by: default avatarQais Yousef <qais.yousef@arm.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent e48767c1
......@@ -42,7 +42,7 @@
/* ================= Device Structure ================== */
struct device_private iproc_priv;
struct bcm_device_private iproc_priv;
/* ==================== Parameters ===================== */
......
......@@ -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
......@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment