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

Commit 58d4ea65 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6 

* 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6:
  mmc_spi: Fix unterminated of_match_table
  of/sparc: fix build regression from of_device changes
  of/device: Replace struct of_device with struct platform_device
parents 26f0cf91 fbe0f834

arch/powerpc/platforms/83xx/mpc837x_mds.c

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static struct of_device_id mpc837x_ids[] = { 


static int __init mpc837x_declare_of_platform_devices(void)

{

	/* Publish of_device */

	/* Publish platform_device */

	of_platform_bus_probe(NULL, mpc837x_ids, NULL);



	return 0;

arch/powerpc/platforms/83xx/mpc837x_rdb.c

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ static struct of_device_id mpc837x_ids[] = { 


static int __init mpc837x_declare_of_platform_devices(void)

{

	/* Publish of_device */

	/* Publish platform_device */

	of_platform_bus_probe(NULL, mpc837x_ids, NULL);



	return 0;

arch/powerpc/sysdev/fsl_rio.c

+1 −1
Original line number Diff line number Diff line
@@ -1332,7 +1332,7 @@ static inline void fsl_rio_info(struct device *dev, u32 ccsr) 


/**

 * fsl_rio_setup - Setup Freescale PowerPC RapidIO interface

 * @dev: of_device pointer

 * @dev: platform_device pointer

 *

 * Initializes MPC85xx RapidIO hardware interface, configures

 * master port with system-specific info, and registers the

drivers/ata/pata_mpc52xx.c

+4 −4
Original line number Diff line number Diff line
@@ -680,7 +680,7 @@ mpc52xx_ata_remove_one(struct device *dev) 
/* ======================================================================== */



static int __devinit

mpc52xx_ata_probe(struct of_device *op, const struct of_device_id *match)

mpc52xx_ata_probe(struct platform_device *op, const struct of_device_id *match)

{

	unsigned int ipb_freq;

	struct resource res_mem;
@@ -821,7 +821,7 @@ mpc52xx_ata_probe(struct of_device *op, const struct of_device_id *match) 
}



static int

mpc52xx_ata_remove(struct of_device *op)

mpc52xx_ata_remove(struct platform_device *op)

{

	struct mpc52xx_ata_priv *priv;

	int task_irq;
@@ -848,7 +848,7 @@ mpc52xx_ata_remove(struct of_device *op) 
#ifdef CONFIG_PM



static int

mpc52xx_ata_suspend(struct of_device *op, pm_message_t state)

mpc52xx_ata_suspend(struct platform_device *op, pm_message_t state)

{

	struct ata_host *host = dev_get_drvdata(&op->dev);
@@ -856,7 +856,7 @@ mpc52xx_ata_suspend(struct of_device *op, pm_message_t state) 
}



static int

mpc52xx_ata_resume(struct of_device *op)

mpc52xx_ata_resume(struct platform_device *op)

{

	struct ata_host *host = dev_get_drvdata(&op->dev);

	struct mpc52xx_ata_priv *priv = host->private_data;

drivers/ata/pata_of_platform.c

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#include <linux/of_platform.h>

#include <linux/ata_platform.h>



static int __devinit pata_of_platform_probe(struct of_device *ofdev,

static int __devinit pata_of_platform_probe(struct platform_device *ofdev,

					    const struct of_device_id *match)

{

	int ret;
@@ -78,7 +78,7 @@ static int __devinit pata_of_platform_probe(struct of_device *ofdev, 
				     reg_shift, pio_mask);

}



static int __devexit pata_of_platform_remove(struct of_device *ofdev)

static int __devexit pata_of_platform_remove(struct platform_device *ofdev)

{

	return __pata_platform_remove(&ofdev->dev);

}