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

Commit 34cdf25a authored Nov 19, 2012 by Bill Pemberton Committed by Greg Kroah-Hartman Nov 28, 2012

pcmcia: remove use of __devinit



CONFIG_HOTPLUG is going away as an option so __devinit is no longer
needed.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Eric Miao <eric.y.miao@gmail.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
Acked-by: Eric Miao <eric.y.miao@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 96364e3a

drivers/pcmcia/bcm63xx_pcmcia.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -323,7 +323,7 @@ static struct pccard_operations bcm63xx_pcmcia_operations = {
	/*		/*
	* register pcmcia socket to core		* register pcmcia socket to core
	*/		*/
	static int __devinit bcm63xx_drv_pcmcia_probe(struct platform_device *pdev)		static int bcm63xx_drv_pcmcia_probe(struct platform_device *pdev)
	{		{
	struct bcm63xx_pcmcia_socket *skt;		struct bcm63xx_pcmcia_socket *skt;
	struct pcmcia_socket *sock;		struct pcmcia_socket *sock;
	@@ -461,7 +461,7 @@ struct platform_driver bcm63xx_pcmcia_driver = {
	};		};

	#ifdef CONFIG_CARDBUS		#ifdef CONFIG_CARDBUS
	static int __devinit bcm63xx_cb_probe(struct pci_dev *dev,		static int bcm63xx_cb_probe(struct pci_dev *dev,
	const struct pci_device_id *id)		const struct pci_device_id *id)
	{		{
	/* keep pci device */		/* keep pci device */

drivers/pcmcia/bfin_cf_pcmcia.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -195,7 +195,7 @@ static struct pccard_operations bfin_cf_ops = {

	/--------------------------------------------------------------------------/		/--------------------------------------------------------------------------/

	static int __devinit bfin_cf_probe(struct platform_device *pdev)		static int bfin_cf_probe(struct platform_device *pdev)
	{		{
	struct bfin_cf_socket *cf;		struct bfin_cf_socket *cf;
	struct resource io_mem, attr_mem;		struct resource io_mem, attr_mem;

drivers/pcmcia/db1xxx_ss.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -409,7 +409,7 @@ static struct pccard_operations db1x_pcmcia_operations = {
	.set_mem_map = au1x00_pcmcia_set_mem_map,		.set_mem_map = au1x00_pcmcia_set_mem_map,
	};		};

	static int __devinit db1x_pcmcia_socket_probe(struct platform_device *pdev)		static int db1x_pcmcia_socket_probe(struct platform_device *pdev)
	{		{
	struct db1x_pcmcia_sock *sock;		struct db1x_pcmcia_sock *sock;
	struct resource *r;		struct resource *r;

drivers/pcmcia/ds.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1318,7 +1318,7 @@ static struct pcmcia_callback pcmcia_bus_callback = {
	.resume = pcmcia_bus_resume,		.resume = pcmcia_bus_resume,
	};		};

	static int __devinit pcmcia_bus_add_socket(struct device *dev,		static int pcmcia_bus_add_socket(struct device *dev,
	struct class_interface *class_intf)		struct class_interface *class_intf)
	{		{
	struct pcmcia_socket *socket = dev_get_drvdata(dev);		struct pcmcia_socket *socket = dev_get_drvdata(dev);

drivers/pcmcia/electra_cf.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -181,7 +181,7 @@ static struct pccard_operations electra_cf_ops = {
	.set_mem_map = electra_cf_set_mem_map,		.set_mem_map = electra_cf_set_mem_map,
	};		};

	static int __devinit electra_cf_probe(struct platform_device *ofdev)		static int electra_cf_probe(struct platform_device *ofdev)
	{		{
	struct device *device = &ofdev->dev;		struct device *device = &ofdev->dev;
	struct device_node *np = ofdev->dev.of_node;		struct device_node *np = ofdev->dev.of_node;