Commit 61c2ef4b authored by Rob Herring's avatar Rob Herring
Browse files

sparc: Use device_get_match_data() 



Use preferred device_get_match_data() instead of of_match_device() to
get the driver match data. With this, adjust the includes to explicitly
include the correct headers.

Signed-off-by: default avatarRob Herring <robh@kernel.org>
parent 9d1694dc

arch/sparc/kernel/pci_sabre.c

+5 −4
Original line number Diff line number Diff line
@@ -13,7 +13,10 @@ 
#include <linux/export.h>

#include <linux/slab.h>

#include <linux/interrupt.h>

#include <linux/of_device.h>

#include <linux/of.h>

#include <linux/of_platform.h>

#include <linux/platform_device.h>

#include <linux/property.h>



#include <asm/apb.h>

#include <asm/iommu.h>
@@ -456,7 +459,6 @@ static void sabre_pbm_init(struct pci_pbm_info *pbm, 
static const struct of_device_id sabre_match[];

static int sabre_probe(struct platform_device *op)

{

	const struct of_device_id *match;

	const struct linux_prom64_registers *pr_regs;

	struct device_node *dp = op->dev.of_node;

	struct pci_pbm_info *pbm;
@@ -466,8 +468,7 @@ static int sabre_probe(struct platform_device *op) 
	const u32 *vdma;

	u64 clear_irq;



	match = of_match_device(sabre_match, &op->dev);

	hummingbird_p = match && (match->data != NULL);

	hummingbird_p = (uintptr_t)device_get_match_data(&op->dev);

	if (!hummingbird_p) {

		struct device_node *cpu_dp;

arch/sparc/kernel/pci_schizo.c

+7 −6
Original line number Diff line number Diff line
@@ -11,7 +11,10 @@ 
#include <linux/slab.h>

#include <linux/export.h>

#include <linux/interrupt.h>

#include <linux/of_device.h>

#include <linux/of.h>

#include <linux/of_platform.h>

#include <linux/platform_device.h>

#include <linux/property.h>

#include <linux/numa.h>



#include <asm/iommu.h>
@@ -1459,15 +1462,13 @@ static int __schizo_init(struct platform_device *op, unsigned long chip_type) 
	return err;

}



static const struct of_device_id schizo_match[];

static int schizo_probe(struct platform_device *op)

{

	const struct of_device_id *match;

	unsigned long chip_type = (unsigned long)device_get_match_data(&op->dev);



	match = of_match_device(schizo_match, &op->dev);

	if (!match)

	if (!chip_type)

		return -EINVAL;

	return __schizo_init(op, (unsigned long)match->data);

	return __schizo_init(op, chip_type);

}



/* The ordering of this table is very important.  Some Tomatillo