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

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

pcmcia: remove use of __devexit



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

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 21fb7674

drivers/pcmcia/bcm63xx_pcmcia.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -436,7 +436,7 @@ static int bcm63xx_drv_pcmcia_probe(struct platform_device *pdev)
	return ret;		return ret;
	}		}

	static int __devexit bcm63xx_drv_pcmcia_remove(struct platform_device *pdev)		static int bcm63xx_drv_pcmcia_remove(struct platform_device *pdev)
	{		{
	struct bcm63xx_pcmcia_socket *skt;		struct bcm63xx_pcmcia_socket *skt;
	struct resource *res;		struct resource *res;
	@@ -469,7 +469,7 @@ static int bcm63xx_cb_probe(struct pci_dev *dev,
	return platform_driver_register(&bcm63xx_pcmcia_driver);		return platform_driver_register(&bcm63xx_pcmcia_driver);
	}		}

	static void __devexit bcm63xx_cb_exit(struct pci_dev *dev)		static void bcm63xx_cb_exit(struct pci_dev *dev)
	{		{
	platform_driver_unregister(&bcm63xx_pcmcia_driver);		platform_driver_unregister(&bcm63xx_pcmcia_driver);
	bcm63xx_cb_dev = NULL;		bcm63xx_cb_dev = NULL;

drivers/pcmcia/bfin_cf_pcmcia.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -286,7 +286,7 @@ static int bfin_cf_probe(struct platform_device *pdev)
	return status;		return status;
	}		}

	static int __devexit bfin_cf_remove(struct platform_device *pdev)		static int bfin_cf_remove(struct platform_device *pdev)
	{		{
	struct bfin_cf_socket *cf = platform_get_drvdata(pdev);		struct bfin_cf_socket *cf = platform_get_drvdata(pdev);

drivers/pcmcia/db1xxx_ss.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -559,7 +559,7 @@ static int db1x_pcmcia_socket_probe(struct platform_device *pdev)
	return ret;		return ret;
	}		}

	static int __devexit db1x_pcmcia_socket_remove(struct platform_device *pdev)		static int db1x_pcmcia_socket_remove(struct platform_device *pdev)
	{		{
	struct db1x_pcmcia_sock *sock = platform_get_drvdata(pdev);		struct db1x_pcmcia_sock *sock = platform_get_drvdata(pdev);

drivers/pcmcia/electra_cf.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -324,7 +324,7 @@ static int electra_cf_probe(struct platform_device *ofdev)

	}		}

	static int __devexit electra_cf_remove(struct platform_device *ofdev)		static int electra_cf_remove(struct platform_device *ofdev)
	{		{
	struct device *device = &ofdev->dev;		struct device *device = &ofdev->dev;
	struct electra_cf_socket *cf;		struct electra_cf_socket *cf;

drivers/pcmcia/i82092.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -162,7 +162,7 @@ static int i82092aa_pci_probe(struct pci_dev dev, const struct pci_device_id i
	return ret;		return ret;
	}		}

	static void __devexit i82092aa_pci_remove(struct pci_dev *dev)		static void i82092aa_pci_remove(struct pci_dev *dev)
	{		{
	struct pcmcia_socket *socket = pci_get_drvdata(dev);		struct pcmcia_socket *socket = pci_get_drvdata(dev);