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

Commit caebcae9 authored by Kevin Hao's avatar Kevin Hao Committed by Ulf Hansson
Browse files

mmc: sdhci: set the .remove to sdhci_pltfm_unregister() 



In these drivers, the driver specific .remove function just a simple
wrapper of function sdhci_pltfm_unregister(). So remove these wrappers
and just set .remove to sdhci_pltfm_unregister().

Signed-off-by: default avatarKevin Hao <haokexin@gmail.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 83eacdfa

drivers/mmc/host/sdhci-bcm-kona.c

+1 −6
Original line number Original line Diff line number Diff line
@@ -323,11 +323,6 @@ static int sdhci_bcm_kona_probe(struct platform_device *pdev) 
	return ret;

	return ret;

}

}





static int sdhci_bcm_kona_remove(struct platform_device *pdev)

{

	return sdhci_pltfm_unregister(pdev);

}



static struct platform_driver sdhci_bcm_kona_driver = {

static struct platform_driver sdhci_bcm_kona_driver = {

	.driver		= {

	.driver		= {

		.name	= "sdhci-kona",

		.name	= "sdhci-kona",
@@ -335,7 +330,7 @@ static struct platform_driver sdhci_bcm_kona_driver = { 
		.of_match_table = sdhci_bcm_kona_of_match,

		.of_match_table = sdhci_bcm_kona_of_match,

	},

	},

	.probe		= sdhci_bcm_kona_probe,

	.probe		= sdhci_bcm_kona_probe,

	.remove		= sdhci_bcm_kona_remove,

	.remove		= sdhci_pltfm_unregister,

};

};

module_platform_driver(sdhci_bcm_kona_driver);

module_platform_driver(sdhci_bcm_kona_driver);

drivers/mmc/host/sdhci-bcm2835.c

+1 −6
Original line number Original line Diff line number Diff line
@@ -180,11 +180,6 @@ static int bcm2835_sdhci_probe(struct platform_device *pdev) 
	return ret;

	return ret;

}

}





static int bcm2835_sdhci_remove(struct platform_device *pdev)

{

	return sdhci_pltfm_unregister(pdev);

}



static const struct of_device_id bcm2835_sdhci_of_match[] = {

static const struct of_device_id bcm2835_sdhci_of_match[] = {

	{ .compatible = "brcm,bcm2835-sdhci" },

	{ .compatible = "brcm,bcm2835-sdhci" },

	{ }

	{ }
@@ -198,7 +193,7 @@ static struct platform_driver bcm2835_sdhci_driver = { 
		.pm = SDHCI_PLTFM_PMOPS,

		.pm = SDHCI_PLTFM_PMOPS,

	},

	},

	.probe = bcm2835_sdhci_probe,

	.probe = bcm2835_sdhci_probe,

	.remove = bcm2835_sdhci_remove,

	.remove = sdhci_pltfm_unregister,

};

};

module_platform_driver(bcm2835_sdhci_driver);

module_platform_driver(bcm2835_sdhci_driver);

drivers/mmc/host/sdhci-cns3xxx.c

+1 −6
Original line number Original line Diff line number Diff line
@@ -98,18 +98,13 @@ static int sdhci_cns3xxx_probe(struct platform_device *pdev) 
	return sdhci_pltfm_register(pdev, &sdhci_cns3xxx_pdata, 0);

	return sdhci_pltfm_register(pdev, &sdhci_cns3xxx_pdata, 0);

}

}





static int sdhci_cns3xxx_remove(struct platform_device *pdev)

{

	return sdhci_pltfm_unregister(pdev);

}



static struct platform_driver sdhci_cns3xxx_driver = {

static struct platform_driver sdhci_cns3xxx_driver = {

	.driver		= {

	.driver		= {

		.name	= "sdhci-cns3xxx",

		.name	= "sdhci-cns3xxx",

		.pm	= SDHCI_PLTFM_PMOPS,

		.pm	= SDHCI_PLTFM_PMOPS,

	},

	},

	.probe		= sdhci_cns3xxx_probe,

	.probe		= sdhci_cns3xxx_probe,

	.remove		= sdhci_cns3xxx_remove,

	.remove		= sdhci_pltfm_unregister,

};

};





module_platform_driver(sdhci_cns3xxx_driver);

module_platform_driver(sdhci_cns3xxx_driver);

drivers/mmc/host/sdhci-dove.c

+1 −6
Original line number Original line Diff line number Diff line
@@ -108,11 +108,6 @@ static int sdhci_dove_probe(struct platform_device *pdev) 
	return ret;

	return ret;

}

}





static int sdhci_dove_remove(struct platform_device *pdev)

{

	return sdhci_pltfm_unregister(pdev);

}



static const struct of_device_id sdhci_dove_of_match_table[] = {

static const struct of_device_id sdhci_dove_of_match_table[] = {

	{ .compatible = "marvell,dove-sdhci", },

	{ .compatible = "marvell,dove-sdhci", },

	{}

	{}
@@ -126,7 +121,7 @@ static struct platform_driver sdhci_dove_driver = { 
		.of_match_table = sdhci_dove_of_match_table,

		.of_match_table = sdhci_dove_of_match_table,

	},

	},

	.probe		= sdhci_dove_probe,

	.probe		= sdhci_dove_probe,

	.remove		= sdhci_dove_remove,

	.remove		= sdhci_pltfm_unregister,

};

};





module_platform_driver(sdhci_dove_driver);

module_platform_driver(sdhci_dove_driver);

drivers/mmc/host/sdhci-of-esdhc.c

+1 −6
Original line number Original line Diff line number Diff line
@@ -386,11 +386,6 @@ static int sdhci_esdhc_probe(struct platform_device *pdev) 
	return ret;

	return ret;

}

}





static int sdhci_esdhc_remove(struct platform_device *pdev)

{

	return sdhci_pltfm_unregister(pdev);

}



static const struct of_device_id sdhci_esdhc_of_match[] = {

static const struct of_device_id sdhci_esdhc_of_match[] = {

	{ .compatible = "fsl,mpc8379-esdhc" },

	{ .compatible = "fsl,mpc8379-esdhc" },

	{ .compatible = "fsl,mpc8536-esdhc" },

	{ .compatible = "fsl,mpc8536-esdhc" },
@@ -406,7 +401,7 @@ static struct platform_driver sdhci_esdhc_driver = { 
		.pm = ESDHC_PMOPS,

		.pm = ESDHC_PMOPS,

	},

	},

	.probe = sdhci_esdhc_probe,

	.probe = sdhci_esdhc_probe,

	.remove = sdhci_esdhc_remove,

	.remove = sdhci_pltfm_unregister,

};

};





module_platform_driver(sdhci_esdhc_driver);

module_platform_driver(sdhci_esdhc_driver);