Remove redundant spi driver bus initialization

This cleanup was already completed between end 2011 and early 2012 with a patch series from Lars-Peter Clausen:
https://lkml.org/lkml/2011/11/24/190

Later on new redundant initialization re-appeared here and there. Time to cleanup again.

And, yes, I'm lazy! I copy-paste the exact same commit message from Lars-Peter; only minor reformat to stay in 75 char/line and fix the name of spi_register_driver().

Regards,
Antonio

Antonio Borneo (6):
ASoC: wm0010: Remove redundant spi driver bus initialization
iio: ssp_sensors: Remove redundant spi driver bus initialization
staging: mt29f_spinand: Remove redundant spi driver bus initialization
net: ieee802154: Remove redundant spi driver bus initialization
wireless: cw1200: Remove redundant spi driver bus initialization [media] s5c73m3: Remove redundant spi driver bus initialization

 drivers/iio/common/ssp_sensors/ssp_dev.c      | 1 -
 drivers/media/i2c/s5c73m3/s5c73m3-spi.c       | 1 -
 drivers/net/ieee802154/cc2520.c               | 1 -
 drivers/net/ieee802154/mrf24j40.c             | 1 -
 drivers/net/wireless/cw1200/cw1200_spi.c      | 1 -
 drivers/staging/mt29f_spinand/mt29f_spinand.c | 1 -
 sound/soc/codecs/wm0010.c                     | 1 -
 7 files changed, 7 deletions(-)

2.4.4

In ancient times it was necessary to manually initialize the bus field of an spi_driver to spi_bus_type. These days this is done in spi_register_driver(), so we can drop the manual assignment.

To: Jaroslav Kysela <[email protected]>
To: Takashi Iwai <[email protected]>
To: Liam Girdwood <[email protected]>
To: Mark Brown <[email protected]>
To: [email protected]
To: [email protected]
Cc: [email protected]

---
 sound/soc/codecs/wm0010.c | 1 -
 1 file changed, 1 deletion(-)

index f37989e..61bfff4 100644
@@ -1005,7 +1005,6 @@ static int wm0010_spi_remove(struct spi_device *spi)
 static struct spi_driver wm0010_spi_driver = {
 	.driver = {
 		.name	= "wm0010",
-		.bus 	= &spi_bus_type,
 		.owner	= THIS_MODULE,
 	},
 	.probe		= wm0010_spi_probe,

2.4.4

In ancient times it was necessary to manually initialize the bus field of an spi_driver to spi_bus_type. These days this is done in spi_register_driver(), so we can drop the manual assignment.

To: Jaroslav Kysela <[email protected]>
To: Takashi Iwai <[email protected]>
To: Liam Girdwood <[email protected]>
To: Mark Brown <[email protected]>
To: [email protected]
To: [email protected]
Cc: [email protected]

---
 sound/soc/codecs/wm0010.c | 1 -
 1 file changed, 1 deletion(-)

index f37989e..61bfff4 100644
@@ -1005,7 +1005,6 @@ static int wm0010_spi_remove(struct spi_device *spi)
 static struct spi_driver wm0010_spi_driver = {
 	.driver = {
 		.name	= "wm0010",
-		.bus 	= &spi_bus_type,
 		.owner	= THIS_MODULE,
 	},
 	.probe		= wm0010_spi_probe,

2.4.4

Thanks,
Charles

The patch

ASoC: wm0010: Remove redundant spi driver bus initialization

has been applied to the asoc tree at

git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark

From: Antonio Borneo <[email protected]>
Date: Tue, 23 Jun 2015 22:52:12 +0800
Subject: [PATCH] ASoC: wm0010: Remove redundant spi driver bus initialization

In ancient times it was necessary to manually initialize the bus field of an spi_driver to spi_bus_type. These days this is done in spi_register_driver(), so we can drop the manual assignment.

---
 sound/soc/codecs/wm0010.c | 1 -
 1 file changed, 1 deletion(-)

index f37989e..61bfff4 100644
@@ -1005,7 +1005,6 @@ static int wm0010_spi_remove(struct spi_device *spi)
 static struct spi_driver wm0010_spi_driver = {
 	.driver = {
 		.name	= "wm0010",
-		.bus 	= &spi_bus_type,
 		.owner	= THIS_MODULE,
 	},
 	.probe		= wm0010_spi_probe,

2.1.4

In ancient times it was necessary to manually initialize the bus field of an spi_driver to spi_bus_type. These days this is done in spi_register_driver(), so we can drop the manual assignment.

To: Jonathan Cameron <[email protected]>
To: Lars-Peter Clausen <[email protected]>
To: Karol Wrona <[email protected]>
To: [email protected]
Cc: [email protected]

---
 drivers/iio/common/ssp_sensors/ssp_dev.c | 1 -
 1 file changed, 1 deletion(-)

index 9a40097..d338bb5 100644
@@ -700,7 +700,6 @@ static struct spi_driver ssp_driver = {
 	.remove = ssp_remove,
 	.driver = {
 		.pm = &ssp_pm_ops,
-		.bus = &spi_bus_type,
 		.owner = THIS_MODULE,
 		.of_match_table = of_match_ptr(ssp_of_match),
 		.name = "sensorhub"

2.4.4

Applied to the togreg branch of iio.git

Thanks,

J

In ancient times it was necessary to manually initialize the bus field of an spi_driver to spi_bus_type. These days this is done in spi_register_driver(), so we can drop the manual assignment.

To: Greg Kroah-Hartman <[email protected]>
To: [email protected]
Cc: [email protected]

---
 drivers/staging/mt29f_spinand/mt29f_spinand.c | 1 -
 1 file changed, 1 deletion(-)

index 7285c64..ad30ce4 100644
@@ -948,7 +948,6 @@ static const struct of_device_id spinand_dt[] = {
 static struct spi_driver spinand_driver = {
 	.driver = {
 		.name		= "mt29f",
-		.bus		= &spi_bus_type,
 		.owner		= THIS_MODULE,
 		.of_match_table	= spinand_dt,
 	},

2.4.4

In ancient times it was necessary to manually initialize the bus field of an spi_driver to spi_bus_type. These days this is done in spi_register_driver(), so we can drop the manual assignment.

To: Alan Ott <[email protected]>
To: Alexander Aring <[email protected]>
To: Varka Bhadram <[email protected]>
To: [email protected]
To: [email protected]
Cc: [email protected]

---
 drivers/net/ieee802154/cc2520.c   | 1 -
 drivers/net/ieee802154/mrf24j40.c | 1 -
 2 files changed, 2 deletions(-)

index f833b8b..bd957f1 100644
@@ -1046,7 +1046,6 @@ MODULE_DEVICE_TABLE(of, cc2520_of_ids);
 static struct spi_driver cc2520_driver = {
 	.driver = {
 		.name = "cc2520",
-		.bus = &spi_bus_type,
 		.owner = THIS_MODULE,
 		.of_match_table = of_match_ptr(cc2520_of_ids),
 	},

index fba2dfd..bc8fb26 100644
@@ -812,7 +812,6 @@ MODULE_DEVICE_TABLE(spi, mrf24j40_ids);
 static struct spi_driver mrf24j40_driver = {
 	.driver = {
 		.name = "mrf24j40",
-		.bus = &spi_bus_type,
 		.owner = THIS_MODULE,
 	},
 	.id_table = mrf24j40_ids,

2.4.4

Hi Antonio Borneo,

Best regards,
Varka Bhadram.

Marcel,

I don't see this patch in any linux-next, net-next, bluetooth-next tree. Could you please apply this patch with the acks by Alan and Varka?

- Alex

Hi Antonio,

patch has been applied to bluetooth-next tree.

Regards

Marcel

In ancient times it was necessary to manually initialize the bus field of an spi_driver to spi_bus_type. These days this is done in spi_register_driver(), so we can drop the manual assignment.

To: Solomon Peachy <[email protected]>
To: Kalle Valo <[email protected]>
To: [email protected]
To: [email protected]
Cc: [email protected]

---
 drivers/net/wireless/cw1200/cw1200_spi.c | 1 -
 1 file changed, 1 deletion(-)

index 7603546..29185ae 100644
@@ -467,7 +467,6 @@ static struct spi_driver spi_driver = {
 	.remove		= cw1200_spi_disconnect,
 	.driver = {
 		.name		= "cw1200_wlan_spi",
-		.bus            = &spi_bus_type,
 		.owner          = THIS_MODULE,
 #ifdef CONFIG_PM
 		.pm		= &cw1200_pm_ops,

2.4.4

Thanks, applied to wireless-drivers-next.git.

Kalle Valo

In ancient times it was necessary to manually initialize the bus field of an spi_driver to spi_bus_type. These days this is done in spi_register_driver(), so we can drop the manual assignment.

To: Mauro Carvalho Chehab <[email protected]>
To: Kyungmin Park <[email protected]>
To: Andrzej Hajda <[email protected]>
To: [email protected]
Cc: [email protected]

---
 drivers/media/i2c/s5c73m3/s5c73m3-spi.c | 1 -
 1 file changed, 1 deletion(-)

index 63eb190..fa4a5eb 100644
@@ -149,7 +149,6 @@ int s5c73m3_register_spi_driver(struct s5c73m3 *state)
 	spidrv->remove = s5c73m3_spi_remove;
 	spidrv->probe = s5c73m3_spi_probe;
 	spidrv->driver.name = S5C73M3_SPI_DRV_NAME;
-	spidrv->driver.bus = &spi_bus_type;
 	spidrv->driver.owner = THIS_MODULE;
 	spidrv->driver.of_match_table = s5c73m3_spi_ids;
 

2.4.4

Regards
Andrzej