Commit 09b2c10d authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Dominik Brodowski
Browse files

pcmcia: sa1100: Make sa11x0_drv_pcmcia_legacy_remove() return void 



sa11x0_drv_pcmcia_legacy_remove() returns zero unconditionally. Letting it
return void instead makes it easier to see in the caller that there is no
error to handle.

This is a preparation for making platform remove callbacks return void.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent dc164f4f

drivers/pcmcia/sa1100_generic.c

+5 −5
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static int sa11x0_drv_pcmcia_legacy_probe(struct platform_device *dev) 
	return ret;

}



static int sa11x0_drv_pcmcia_legacy_remove(struct platform_device *dev)

static void sa11x0_drv_pcmcia_legacy_remove(struct platform_device *dev)

{

	struct skt_dev_info *sinfo = platform_get_drvdata(dev);

	int i;
@@ -134,8 +134,6 @@ static int sa11x0_drv_pcmcia_legacy_remove(struct platform_device *dev) 


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

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



	return 0;

}



static int sa11x0_drv_pcmcia_probe(struct platform_device *pdev)
@@ -167,8 +165,10 @@ static int sa11x0_drv_pcmcia_remove(struct platform_device *dev) 
{

	struct soc_pcmcia_socket *skt;



	if (dev->id == -1)

		return sa11x0_drv_pcmcia_legacy_remove(dev);

	if (dev->id == -1) {

		sa11x0_drv_pcmcia_legacy_remove(dev);

		return 0;

	}



	skt = platform_get_drvdata(dev);