Commit 2deff8d6 authored by Grant Likely's avatar Grant Likely
Browse files

spi: Remove erroneous __init, __exit and __exit_p() references in drivers 



Some of the spi driver module remove hooks were annotated with __exit
and referenced with __exit_p(). Presumably these were supposed to be
__devinit, __devexit and __devexit_p() since __init/__exit for a
probe/remove hook has never been correct. They also got missed during
the big __devinit/__devexit purge since they didn't match the pattern.
Remove then now to be rid of it.

v2: purge __init also

Reported-by: default avatarArnd Bergmann <arnd@arndb.de>
[Arnd set a patch cleaning up one, and then I found more]
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent 75bf3361

drivers/spi/spi-atmel.c

+1 −1
Original line number Diff line number Diff line
@@ -1088,7 +1088,7 @@ static struct platform_driver atmel_spi_driver = { 
	.suspend	= atmel_spi_suspend,

	.resume		= atmel_spi_resume,

	.probe		= atmel_spi_probe,

	.remove		= __exit_p(atmel_spi_remove),

	.remove		= atmel_spi_remove,

};

module_platform_driver(atmel_spi_driver);

drivers/spi/spi-au1550.c

+4 −4
Original line number Diff line number Diff line
@@ -717,7 +717,7 @@ static void au1550_spi_bits_handlers_set(struct au1550_spi *hw, int bpw) 
	}

}



static void __init au1550_spi_setup_psc_as_spi(struct au1550_spi *hw)

static void au1550_spi_setup_psc_as_spi(struct au1550_spi *hw)

{

	u32 stat, cfg;
@@ -766,7 +766,7 @@ static void __init au1550_spi_setup_psc_as_spi(struct au1550_spi *hw) 
}





static int __init au1550_spi_probe(struct platform_device *pdev)

static int au1550_spi_probe(struct platform_device *pdev)

{

	struct au1550_spi *hw;

	struct spi_master *master;
@@ -968,7 +968,7 @@ err_nomem: 
	return err;

}



static int __exit au1550_spi_remove(struct platform_device *pdev)

static int au1550_spi_remove(struct platform_device *pdev)

{

	struct au1550_spi *hw = platform_get_drvdata(pdev);
@@ -997,7 +997,7 @@ static int __exit au1550_spi_remove(struct platform_device *pdev) 
MODULE_ALIAS("platform:au1550-spi");



static struct platform_driver au1550_spi_drv = {

	.remove = __exit_p(au1550_spi_remove),

	.remove = au1550_spi_remove,

	.driver = {

		.name = "au1550-spi",

		.owner = THIS_MODULE,

drivers/spi/spi-bfin5xx.c

+1 −1
Original line number Diff line number Diff line
@@ -1273,7 +1273,7 @@ static int bfin_spi_destroy_queue(struct bfin_spi_master_data *drv_data) 
	return 0;

}



static int __init bfin_spi_probe(struct platform_device *pdev)

static int bfin_spi_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct bfin5xx_spi_master *platform_info;

drivers/spi/spi-omap-100k.c

+3 −3
Original line number Diff line number Diff line
@@ -481,7 +481,7 @@ static int omap1_spi100k_transfer(struct spi_device *spi, struct spi_message *m) 
	return 0;

}



static int __init omap1_spi100k_reset(struct omap1_spi100k *spi100k)

static int omap1_spi100k_reset(struct omap1_spi100k *spi100k)

{

	return 0;

}
@@ -560,7 +560,7 @@ err1: 
	return status;

}



static int __exit omap1_spi100k_remove(struct platform_device *pdev)

static int omap1_spi100k_remove(struct platform_device *pdev)

{

	struct spi_master       *master;

	struct omap1_spi100k    *spi100k;
@@ -604,7 +604,7 @@ static struct platform_driver omap1_spi100k_driver = { 
		.name		= "omap1_spi100k",

		.owner		= THIS_MODULE,

	},

	.remove		= __exit_p(omap1_spi100k_remove),

	.remove		= omap1_spi100k_remove,

};

drivers/spi/spi-omap-uwire.c

+3 −3
Original line number Diff line number Diff line
@@ -476,7 +476,7 @@ static void uwire_off(struct uwire_spi *uwire) 
	spi_master_put(uwire->bitbang.master);

}



static int __init uwire_probe(struct platform_device *pdev)

static int uwire_probe(struct platform_device *pdev)

{

	struct spi_master	*master;

	struct uwire_spi	*uwire;
@@ -536,7 +536,7 @@ static int __init uwire_probe(struct platform_device *pdev) 
	return status;

}



static int __exit uwire_remove(struct platform_device *pdev)

static int uwire_remove(struct platform_device *pdev)

{

	struct uwire_spi	*uwire = dev_get_drvdata(&pdev->dev);

	int			status;
@@ -557,7 +557,7 @@ static struct platform_driver uwire_driver = { 
		.name		= "omap_uwire",

		.owner		= THIS_MODULE,

	},

	.remove		= __exit_p(uwire_remove),

	.remove		= uwire_remove,

	// suspend ... unuse ck

	// resume ... use ck

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE