Commit 7c1ab16b authored by Nick Child's avatar Nick Child Committed by Michael Ellerman
Browse files

powerpc/cell: Add __init attribute to eligible functions 



Some functions defined in 'arch/powerpc/platforms/cell' are deserving of an
`__init` macro attribute. These functions are only called by other
initialization functions and therefore should inherit the attribute.

Signed-off-by: default avatarNick Child <nick.child@ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20211216220035.605465-8-nick.child@ibm.com
parent 456e8eb3

arch/powerpc/platforms/cell/cbe_regs.c

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ u32 cbe_node_to_cpu(int node) 
}

EXPORT_SYMBOL_GPL(cbe_node_to_cpu);



static struct device_node *cbe_get_be_node(int cpu_id)

static struct device_node *__init cbe_get_be_node(int cpu_id)

{

	struct device_node *np;

arch/powerpc/platforms/cell/iommu.c

+7 −7
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ static irqreturn_t ioc_interrupt(int irq, void *data) 
	return IRQ_HANDLED;

}



static int cell_iommu_find_ioc(int nid, unsigned long *base)

static int __init cell_iommu_find_ioc(int nid, unsigned long *base)

{

	struct device_node *np;

	struct resource r;
@@ -293,7 +293,7 @@ static int cell_iommu_find_ioc(int nid, unsigned long *base) 
	return -ENODEV;

}



static void cell_iommu_setup_stab(struct cbe_iommu *iommu,

static void __init cell_iommu_setup_stab(struct cbe_iommu *iommu,

				unsigned long dbase, unsigned long dsize,

				unsigned long fbase, unsigned long fsize)

{
@@ -313,7 +313,7 @@ static void cell_iommu_setup_stab(struct cbe_iommu *iommu, 
	memset(iommu->stab, 0, stab_size);

}



static unsigned long *cell_iommu_alloc_ptab(struct cbe_iommu *iommu,

static unsigned long *__init cell_iommu_alloc_ptab(struct cbe_iommu *iommu,

		unsigned long base, unsigned long size, unsigned long gap_base,

		unsigned long gap_size, unsigned long page_shift)

{
@@ -373,7 +373,7 @@ static unsigned long *cell_iommu_alloc_ptab(struct cbe_iommu *iommu, 
	return ptab;

}



static void cell_iommu_enable_hardware(struct cbe_iommu *iommu)

static void __init cell_iommu_enable_hardware(struct cbe_iommu *iommu)

{

	int ret;

	unsigned long reg, xlate_base;
@@ -413,7 +413,7 @@ static void cell_iommu_enable_hardware(struct cbe_iommu *iommu) 
	out_be64(iommu->cmd_regs + IOC_IOCmd_Cfg, reg);

}



static void cell_iommu_setup_hardware(struct cbe_iommu *iommu,

static void __init cell_iommu_setup_hardware(struct cbe_iommu *iommu,

	unsigned long base, unsigned long size)

{

	cell_iommu_setup_stab(iommu, base, size, 0, 0);
@@ -858,7 +858,7 @@ static bool cell_pci_iommu_bypass_supported(struct pci_dev *pdev, u64 mask) 
		cell_iommu_get_fixed_address(&pdev->dev) != OF_BAD_ADDR;

}



static void insert_16M_pte(unsigned long addr, unsigned long *ptab,

static void __init insert_16M_pte(unsigned long addr, unsigned long *ptab,

			   unsigned long base_pte)

{

	unsigned long segment, offset;
@@ -873,7 +873,7 @@ static void insert_16M_pte(unsigned long addr, unsigned long *ptab, 
	ptab[offset] = base_pte | (__pa(addr) & CBE_IOPTE_RPN_Mask);

}



static void cell_iommu_setup_fixed_ptab(struct cbe_iommu *iommu,

static void __init cell_iommu_setup_fixed_ptab(struct cbe_iommu *iommu,

	struct device_node *np, unsigned long dbase, unsigned long dsize,

	unsigned long fbase, unsigned long fsize)

{

arch/powerpc/platforms/cell/spu_base.c

+3 −3
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ spu_irq_class_2(int irq, void *data) 
	return stat ? IRQ_HANDLED : IRQ_NONE;

}



static int spu_request_irqs(struct spu *spu)

static int __init spu_request_irqs(struct spu *spu)

{

	int ret = 0;
@@ -540,7 +540,7 @@ void spu_remove_dev_attr_group(struct attribute_group *attrs) 
}

EXPORT_SYMBOL_GPL(spu_remove_dev_attr_group);



static int spu_create_dev(struct spu *spu)

static int __init spu_create_dev(struct spu *spu)

{

	int ret;
@@ -711,7 +711,7 @@ static void crash_kexec_stop_spus(void) 
	}

}



static void crash_register_spus(struct list_head *list)

static void __init crash_register_spus(struct list_head *list)

{

	struct spu *spu;

	int ret;

arch/powerpc/platforms/cell/spu_manage.c

+8 −8
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ static int __init spu_map_interrupts(struct spu *spu, struct device_node *np) 
	return -EINVAL;

}



static int spu_map_resource(struct spu *spu, int nr,

static int __init spu_map_resource(struct spu *spu, int nr,

			    void __iomem** virt, unsigned long *phys)

{

	struct device_node *np = spu->devnode;
@@ -361,7 +361,7 @@ static void disable_spu_by_master_run(struct spu_context *ctx) 
static int qs20_reg_idxs[QS20_SPES_PER_BE] =   { 0, 2, 4, 6, 7, 5, 3, 1 };

static int qs20_reg_memory[QS20_SPES_PER_BE] = { 1, 1, 0, 0, 0, 0, 0, 0 };



static struct spu *spu_lookup_reg(int node, u32 reg)

static struct spu *__init spu_lookup_reg(int node, u32 reg)

{

	struct spu *spu;

	const u32 *spu_reg;
@@ -374,7 +374,7 @@ static struct spu *spu_lookup_reg(int node, u32 reg) 
	return NULL;

}



static void init_affinity_qs20_harcoded(void)

static void __init init_affinity_qs20_harcoded(void)

{

	int node, i;

	struct spu *last_spu, *spu;
@@ -396,7 +396,7 @@ static void init_affinity_qs20_harcoded(void) 
	}

}



static int of_has_vicinity(void)

static int __init of_has_vicinity(void)

{

	struct device_node *dn;
@@ -409,7 +409,7 @@ static int of_has_vicinity(void) 
	return 0;

}



static struct spu *devnode_spu(int cbe, struct device_node *dn)

static struct spu *__init devnode_spu(int cbe, struct device_node *dn)

{

	struct spu *spu;
@@ -419,7 +419,7 @@ static struct spu *devnode_spu(int cbe, struct device_node *dn) 
	return NULL;

}



static struct spu *

static struct spu * __init

neighbour_spu(int cbe, struct device_node *target, struct device_node *avoid)

{

	struct spu *spu;
@@ -440,7 +440,7 @@ neighbour_spu(int cbe, struct device_node *target, struct device_node *avoid) 
	return NULL;

}



static void init_affinity_node(int cbe)

static void __init init_affinity_node(int cbe)

{

	struct spu *spu, *last_spu;

	struct device_node *vic_dn, *last_spu_dn;
@@ -494,7 +494,7 @@ static void init_affinity_node(int cbe) 
	}

}



static void init_affinity_fw(void)

static void __init init_affinity_fw(void)

{

	int cbe;

arch/powerpc/platforms/cell/spufs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -648,7 +648,7 @@ static void spufs_exit_isolated_loader(void) 
			get_order(isolated_loader_size));

}



static void

static void __init

spufs_init_isolated_loader(void)

{

	struct device_node *dn;