Commit 99651337 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/controller/layerscape' 

- Make the ls-gen4 struct mobiveil_rp_ops constant (Christophe JAILLET)

* pci/controller/layerscape:
  PCI: ls-gen4: Make struct mobiveil_rp_ops constant
parents db2cc94f cd09a6ac

drivers/pci/controller/mobiveil/pcie-layerscape-gen4.c

+1 −1
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ static void ls_g4_pcie_reset(struct work_struct *work) 
	ls_g4_pcie_enable_interrupt(pcie);

}



static struct mobiveil_rp_ops ls_g4_pcie_rp_ops = {

static const struct mobiveil_rp_ops ls_g4_pcie_rp_ops = {

	.interrupt_init = ls_g4_pcie_interrupt_init,

};

drivers/pci/controller/mobiveil/pcie-mobiveil.h

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ struct mobiveil_rp_ops { 
struct mobiveil_root_port {

	void __iomem *config_axi_slave_base;	/* endpoint config base */

	struct resource *ob_io_res;

	struct mobiveil_rp_ops *ops;

	const struct mobiveil_rp_ops *ops;

	int irq;

	raw_spinlock_t intx_mask_lock;

	struct irq_domain *intx_domain;