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

Commit 71a157e8 authored by Grant Likely's avatar Grant Likely
Browse files

of: add 'of_' prefix to machine_is_compatible() 



machine is compatible is an OF-specific call.  It should have
the of_ prefix to protect the global namespace.

Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Acked-by: default avatarMichal Simek <monstr@monstr.eu>
parent 89751a7c

arch/powerpc/kernel/pci_64.c

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ long sys_pciconfig_iobase(long which, unsigned long in_bus, 
	 * G5 machines... So when something asks for bus 0 io base

	 * (bus 0 is HT root), we return the AGP one instead.

	 */

	if (in_bus == 0 && machine_is_compatible("MacRISC4")) {

	if (in_bus == 0 && of_machine_is_compatible("MacRISC4")) {

		struct device_node *agp;



		agp = of_find_compatible_node(NULL, NULL, "u3-agp");

arch/powerpc/platforms/85xx/xes_mpc85xx.c

+2 −2
Original line number Diff line number Diff line
@@ -80,8 +80,8 @@ static void xes_mpc85xx_configure_l2(void __iomem *l2_base) 
	printk(KERN_INFO "xes_mpc85xx: Enabling L2 as cache\n");



	ctl = MPC85xx_L2CTL_L2E | MPC85xx_L2CTL_L2I;

	if (machine_is_compatible("MPC8540") ||

	    machine_is_compatible("MPC8560"))

	if (of_machine_is_compatible("MPC8540") ||

	    of_machine_is_compatible("MPC8560"))

		/*

		 * Assume L2 SRAM is used fully for cache, so set

		 * L2BLKSZ (bits 4:5) to match L2SIZ (bits 2:3).

arch/powerpc/platforms/cell/cbe_powerbutton.c

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ static int __init cbe_powerbutton_init(void) 
	int ret = 0;

	struct input_dev *dev;



	if (!machine_is_compatible("IBM,CBPLUS-1.0")) {

	if (!of_machine_is_compatible("IBM,CBPLUS-1.0")) {

		printk(KERN_ERR "%s: Not a cell blade.\n", __func__);

		ret = -ENODEV;

		goto out;

arch/powerpc/platforms/cell/ras.c

+1 −1
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ static int __init cbe_sysreset_init(void) 
{

	struct cbe_pmd_regs __iomem *regs;



	sysreset_hack = machine_is_compatible("IBM,CBPLUS-1.0");

	sysreset_hack = of_machine_is_compatible("IBM,CBPLUS-1.0");

	if (!sysreset_hack)

		return 0;

arch/powerpc/platforms/pasemi/cpufreq.c

+2 −2
Original line number Diff line number Diff line
@@ -304,8 +304,8 @@ static struct cpufreq_driver pas_cpufreq_driver = { 


static int __init pas_cpufreq_init(void)

{

	if (!machine_is_compatible("PA6T-1682M") &&

	    !machine_is_compatible("pasemi,pwrficient"))

	if (!of_machine_is_compatible("PA6T-1682M") &&

	    !of_machine_is_compatible("pasemi,pwrficient"))

		return -ENODEV;



	return cpufreq_register_driver(&pas_cpufreq_driver);