Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a43f32d6 authored by Matwey V. Kornilov's avatar Matwey V. Kornilov Committed by Bjorn Helgaas
Browse files

PCI: spear: Drop __initdata from spear13xx_pcie_driver 



Struct spear13xx_pcie_driver was in initdata, but we passed a pointer to it
to platform_driver_register(), which can use the pointer at arbitrary times
in the future, even after the initdata is freed.  That leads to crashes.

Move spear13xx_pcie_driver and things referenced by it
(spear13xx_pcie_probe() and dw_pcie_host_init()) out of initdata.

[bhelgaas: changelog]
Fixes: 6675ef21 ("PCI: spear: Fix Section mismatch compilation warning for probe()")
Signed-off-by: default avatarMatwey V. Kornilov <matwey@sai.msu.ru>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
CC: stable@vger.kernel.org	# v3.17+
parent 085a68d0

drivers/pci/host/pcie-designware.c

+1 −1
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ static const struct irq_domain_ops msi_domain_ops = { 
	.map = dw_pcie_msi_map,

};



int __init dw_pcie_host_init(struct pcie_port *pp)

int dw_pcie_host_init(struct pcie_port *pp)

{

	struct device_node *np = pp->dev->of_node;

	struct platform_device *pdev = to_platform_device(pp->dev);

drivers/pci/host/pcie-spear13xx.c

+3 −3
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ static struct pcie_host_ops spear13xx_pcie_host_ops = { 
	.host_init = spear13xx_pcie_host_init,

};



static int __init spear13xx_add_pcie_port(struct pcie_port *pp,

static int spear13xx_add_pcie_port(struct pcie_port *pp,

					 struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;
@@ -299,7 +299,7 @@ static int __init spear13xx_add_pcie_port(struct pcie_port *pp, 
	return 0;

}



static int __init spear13xx_pcie_probe(struct platform_device *pdev)

static int spear13xx_pcie_probe(struct platform_device *pdev)

{

	struct spear13xx_pcie *spear13xx_pcie;

	struct pcie_port *pp;
@@ -370,7 +370,7 @@ static const struct of_device_id spear13xx_pcie_of_match[] = { 
};

MODULE_DEVICE_TABLE(of, spear13xx_pcie_of_match);



static struct platform_driver spear13xx_pcie_driver __initdata = {

static struct platform_driver spear13xx_pcie_driver = {

	.probe		= spear13xx_pcie_probe,

	.driver = {

		.name	= "spear-pcie",