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

Commit 9bde36af authored by Grant Likely's avatar Grant Likely
Browse files

Merge branch 'devicetree/next' into spi/next 

To pick up removal of #ifdef around .of_match_table
parents f020c39e c9e358df

drivers/i2c/busses/i2c-ocores.c

+3 −11
Original line number Diff line number Diff line
@@ -330,9 +330,7 @@ static int __devinit ocores_i2c_probe(struct platform_device *pdev) 
	i2c->adap = ocores_adapter;

	i2c_set_adapdata(&i2c->adap, i2c);

	i2c->adap.dev.parent = &pdev->dev;

#ifdef CONFIG_OF

	i2c->adap.dev.of_node = pdev->dev.of_node;

#endif



	/* add i2c adapter to i2c tree */

	ret = i2c_add_adapter(&i2c->adap);
@@ -390,15 +388,11 @@ static int ocores_i2c_resume(struct platform_device *pdev) 
#define ocores_i2c_resume	NULL

#endif



#ifdef CONFIG_OF

static struct of_device_id ocores_i2c_match[] = {

        {

                .compatible = "opencores,i2c-ocores",

        },

	{ .compatible = "opencores,i2c-ocores", },

	{},

};

MODULE_DEVICE_TABLE(of, ocores_i2c_match);

#endif



/* work with hotplug and coldplug */

MODULE_ALIAS("platform:ocores-i2c");
@@ -411,9 +405,7 @@ static struct platform_driver ocores_i2c_driver = { 
	.driver  = {

		.owner = THIS_MODULE,

		.name = "ocores-i2c",

#ifdef CONFIG_OF

		.of_match_table = ocores_i2c_match,

#endif

	},

};

drivers/i2c/i2c-core.c

+0 −2
Original line number Diff line number Diff line
@@ -537,9 +537,7 @@ i2c_new_device(struct i2c_adapter *adap, struct i2c_board_info const *info) 
	client->dev.parent = &client->adapter->dev;

	client->dev.bus = &i2c_bus_type;

	client->dev.type = &i2c_client_type;

#ifdef CONFIG_OF

	client->dev.of_node = info->of_node;

#endif



	dev_set_name(&client->dev, "%d-%04x", i2c_adapter_id(adap),

		     client->addr);

drivers/mmc/host/mmc_spi.c

+0 −4
Original line number Diff line number Diff line
@@ -1516,21 +1516,17 @@ static int __devexit mmc_spi_remove(struct spi_device *spi) 
	return 0;

}



#if defined(CONFIG_OF)

static struct of_device_id mmc_spi_of_match_table[] __devinitdata = {

	{ .compatible = "mmc-spi-slot", },

	{},

};

#endif



static struct spi_driver mmc_spi_driver = {

	.driver = {

		.name =		"mmc_spi",

		.bus =		&spi_bus_type,

		.owner =	THIS_MODULE,

#if defined(CONFIG_OF)

		.of_match_table = mmc_spi_of_match_table,

#endif

	},

	.probe =	mmc_spi_probe,

	.remove =	__devexit_p(mmc_spi_remove),

drivers/net/ethoc.c

+1 −7
Original line number Diff line number Diff line
@@ -1163,15 +1163,11 @@ static int ethoc_resume(struct platform_device *pdev) 
# define ethoc_resume  NULL

#endif



#ifdef CONFIG_OF

static struct of_device_id ethoc_match[] = {

	{

		.compatible = "opencores,ethoc",

	},

	{ .compatible = "opencores,ethoc", },

	{},

};

MODULE_DEVICE_TABLE(of, ethoc_match);

#endif



static struct platform_driver ethoc_driver = {

	.probe   = ethoc_probe,
@@ -1181,9 +1177,7 @@ static struct platform_driver ethoc_driver = { 
	.driver  = {

		.name = "ethoc",

		.owner = THIS_MODULE,

#ifdef CONFIG_OF

		.of_match_table = ethoc_match,

#endif

	},

};

drivers/spi/pxa2xx_spi.c

+0 −2
Original line number Diff line number Diff line
@@ -1557,9 +1557,7 @@ static int __devinit pxa2xx_spi_probe(struct platform_device *pdev) 
	drv_data->ssp = ssp;



	master->dev.parent = &pdev->dev;

#ifdef CONFIG_OF

	master->dev.of_node = pdev->dev.of_node;

#endif

	/* the spi->mode bits understood by this driver: */

	master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH;