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

Commit be85458e authored by Russell King - ARM Linux's avatar Russell King - ARM Linux Committed by Dominik Brodowski
Browse files

PCMCIA: soc_common: push socket removal down to SoC specific support 



Mechanically transplant the removal code from soc_common into each
SoC specific base support file, thereby allowing
soc_common_drv_pcmcia_remove to be removed.  No other changes.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 097e296d

drivers/pcmcia/pxa2xx_base.c

+10 −1
Original line number Diff line number Diff line
@@ -297,7 +297,16 @@ static int pxa2xx_drv_pcmcia_probe(struct platform_device *dev) 


static int pxa2xx_drv_pcmcia_remove(struct platform_device *dev)

{

	return soc_common_drv_pcmcia_remove(&dev->dev);

	struct skt_dev_info *sinfo = platform_get_drvdata(dev);

	int i;



	platform_set_drvdata(dev, NULL);



	for (i = 0; i < sinfo->nskt; i++)

		soc_pcmcia_remove_one(&sinfo->skt[i]);



	kfree(sinfo);

	return 0;

}



static int pxa2xx_drv_pcmcia_suspend(struct device *dev)

drivers/pcmcia/sa1100_generic.c

+10 −1
Original line number Diff line number Diff line
@@ -83,7 +83,16 @@ static int sa11x0_drv_pcmcia_probe(struct platform_device *dev) 


static int sa11x0_drv_pcmcia_remove(struct platform_device *dev)

{

	return soc_common_drv_pcmcia_remove(&dev->dev);

	struct skt_dev_info *sinfo = platform_get_drvdata(dev);

	int i;



	platform_set_drvdata(dev, NULL);



	for (i = 0; i < sinfo->nskt; i++)

		soc_pcmcia_remove_one(&sinfo->skt[i]);



	kfree(sinfo);

	return 0;

}



static int sa11x0_drv_pcmcia_suspend(struct platform_device *dev,

drivers/pcmcia/sa1111_generic.c

+9 −1
Original line number Diff line number Diff line
@@ -152,7 +152,15 @@ static int pcmcia_probe(struct sa1111_dev *dev) 


static int __devexit pcmcia_remove(struct sa1111_dev *dev)

{

	soc_common_drv_pcmcia_remove(&dev->dev);

	struct skt_dev_info *sinfo = dev_get_drvdata(&dev->dev);

	int i;



	dev_set_drvdata(&dev->dev, NULL);



	for (i = 0; i < sinfo->nskt; i++)

		soc_pcmcia_remove_one(&sinfo->skt[i]);



	kfree(sinfo);

	release_mem_region(dev->res.start, 512);

	return 0;

}

drivers/pcmcia/soc_common.c

+0 −16
Original line number Diff line number Diff line
@@ -778,22 +778,6 @@ int soc_common_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops 
}

EXPORT_SYMBOL(soc_common_drv_pcmcia_probe);



int soc_common_drv_pcmcia_remove(struct device *dev)

{

	struct skt_dev_info *sinfo = dev_get_drvdata(dev);

	int i;



	dev_set_drvdata(dev, NULL);



	for (i = 0; i < sinfo->nskt; i++)

		soc_pcmcia_remove_one(&sinfo->skt[i]);



	kfree(sinfo);



	return 0;

}

EXPORT_SYMBOL(soc_common_drv_pcmcia_remove);



MODULE_AUTHOR("John Dorsey <john+@cs.cmu.edu>");

MODULE_DESCRIPTION("Linux PCMCIA Card Services: Common SoC support");

MODULE_LICENSE("Dual MPL/GPL");

drivers/pcmcia/soc_common.h

+0 −1
Original line number Diff line number Diff line
@@ -139,7 +139,6 @@ void soc_pcmcia_remove_one(struct soc_pcmcia_socket *skt); 
int soc_pcmcia_add_one(struct soc_pcmcia_socket *skt);



extern int soc_common_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops, struct skt_dev_info *sinfo);

extern int soc_common_drv_pcmcia_remove(struct device *dev);





#ifdef CONFIG_PCMCIA_DEBUG