Skip to contentSkip to conversation

RTC: Remove redundant spi driver bus initialization

PATCH Applied Lars-Peter Clausen 12 participants 23 messages Nov 24, 2011 – Dec 12, 2011

Subsystems (15)
lore
Share & tools
lore
#0 lore raw

PATCH 1/11 RTC: 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_driver_register(), so we can drop the manual assignment.

The patch was generated using the following coccinelle semantic patch:
// <smpl>
@@
identifier _driver;
@@

struct spi_driver _driver = {
	.driver = {
-		.bus = &spi_bus_type,
	},
};

// </smpl>

---
 drivers/rtc/rtc-m41t93.c  |    1 -
 drivers/rtc/rtc-m41t94.c  |    1 -
 drivers/rtc/rtc-max6902.c |    1 -
 drivers/rtc/rtc-pcf2123.c |    1 -
 drivers/rtc/rtc-rs5c348.c |    1 -
 5 files changed, 0 insertions(+), 5 deletions(-)
drivers/rtc/rtc-m41t93.c +0 -1
index 7317d3b..ef71132 100644
@@ -200,7 +200,6 @@ static int __devexit m41t93_remove(struct spi_device *spi)
 static struct spi_driver m41t93_driver = {
 	.driver = {
 		.name	= "rtc-m41t93",
-		.bus	= &spi_bus_type,
 		.owner	= THIS_MODULE,
 	},
 	.probe	= m41t93_probe,
drivers/rtc/rtc-m41t94.c +0 -1
index e259ed7..2a4721f 100644
@@ -147,7 +147,6 @@ static int __devexit m41t94_remove(struct spi_device *spi)
 static struct spi_driver m41t94_driver = {
 	.driver = {
 		.name	= "rtc-m41t94",
-		.bus	= &spi_bus_type,
 		.owner	= THIS_MODULE,
 	},
 	.probe	= m41t94_probe,
drivers/rtc/rtc-max6902.c +0 -1
index 0ec3f58..1f6b3cc 100644
@@ -154,7 +154,6 @@ static int __devexit max6902_remove(struct spi_device *spi)
 static struct spi_driver max6902_driver = {
 	.driver = {
 		.name	= "rtc-max6902",
-		.bus	= &spi_bus_type,
 		.owner	= THIS_MODULE,
 	},
 	.probe	= max6902_probe,
drivers/rtc/rtc-pcf2123.c +0 -1
index 2ee3bbf..b46c400 100644
@@ -340,7 +340,6 @@ static int __devexit pcf2123_remove(struct spi_device *spi)
 static struct spi_driver pcf2123_driver = {
 	.driver	= {
 			.name	= "rtc-pcf2123",
-			.bus	= &spi_bus_type,
 			.owner	= THIS_MODULE,
 	},
 	.probe	= pcf2123_probe,
drivers/rtc/rtc-rs5c348.c +0 -1
index 971bc8e..ce2ca85 100644
@@ -229,7 +229,6 @@ static int __devexit rs5c348_remove(struct spi_device *spi)
 static struct spi_driver rs5c348_driver = {
 	.driver = {
 		.name	= "rtc-rs5c348",
-		.bus	= &spi_bus_type,
 		.owner	= THIS_MODULE,
 	},
 	.probe	= rs5c348_probe,
Signature · 1 line
1.7.7.1
#1 lore raw

PATCH 2/11 TTY: 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_driver_register(), so we can drop the manual assignment.

The patch was generated using the following coccinelle semantic patch:
// <smpl>
@@
identifier _driver;
@@

struct spi_driver _driver = {
	.driver = {
-		.bus = &spi_bus_type,
	},
};

// </smpl>

Cc Alan Cox <[email protected]> (maintainer:SERIAL DRIVERS)
Cc [email protected] (open list:SERIAL DRIVERS)
---
 drivers/tty/serial/ifx6x60.c      |    1 -
 drivers/tty/serial/max3100.c      |    1 -
 drivers/tty/serial/max3107-aava.c |    1 -
 drivers/tty/serial/max3107.c      |    1 -
 drivers/tty/serial/mrst_max3110.c |    1 -
 5 files changed, 0 insertions(+), 5 deletions(-)
drivers/tty/serial/ifx6x60.c +0 -1
index 426434e..7e925e2 100644
@@ -1334,7 +1334,6 @@ MODULE_DEVICE_TABLE(spi, ifx_id_table);
 static const struct spi_driver ifx_spi_driver = {
 	.driver = {
 		.name = DRVNAME,
-		.bus = &spi_bus_type,
 		.pm = &ifx_spi_pm,
 		.owner = THIS_MODULE},
 	.probe = ifx_spi_spi_probe,
drivers/tty/serial/max3100.c +0 -1
index 8a6cc8c..b4902b9 100644
@@ -901,7 +901,6 @@ static int max3100_resume(struct spi_device *spi)
 static struct spi_driver max3100_driver = {
 	.driver = {
 		.name		= "max3100",
-		.bus		= &spi_bus_type,
 		.owner		= THIS_MODULE,
 	},
 
drivers/tty/serial/max3107-aava.c +0 -1
index 90c40f2..aae772a 100644
@@ -315,7 +315,6 @@ static int __devinit max3107_probe_aava(struct spi_device *spi)
 static struct spi_driver max3107_driver = {
 	.driver = {
 		.name		= "aava-max3107",
-		.bus		= &spi_bus_type,
 		.owner		= THIS_MODULE,
 	},
 	.probe		= max3107_probe_aava,
drivers/tty/serial/max3107.c +0 -1
index 7827000..17c7ba8 100644
@@ -1181,7 +1181,6 @@ static int max3107_probe_generic(struct spi_device *spi)
 static struct spi_driver max3107_driver = {
 	.driver = {
 		.name		= "max3107",
-		.bus		= &spi_bus_type,
 		.owner		= THIS_MODULE,
 	},
 	.probe		= max3107_probe_generic,
drivers/tty/serial/mrst_max3110.c +0 -1
index 4c309e8..df2a224 100644
@@ -876,7 +876,6 @@ static int __devexit serial_m3110_remove(struct spi_device *dev)
 static struct spi_driver uart_max3110_driver = {
 	.driver = {
 			.name	= "spi_max3111",
-			.bus	= &spi_bus_type,
 			.owner	= THIS_MODULE,
 	},
 	.probe		= serial_m3110_probe,
Signature · 1 line
1.7.7.1
#2 lore raw

Re: [PATCH 02/11] TTY: Remove redundant spi driver bus initialization

Quoted 14 lines · Lars-Peter Clausen

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_driver_register(), so we can drop the manual assignment.

The patch was generated using the following coccinelle semantic patch:
// <smpl>
@@
identifier _driver;
@@

struct spi_driver _driver = {
	.driver = {
(quoted diff) +0 -1
-		.bus = &spi_bus_type,
	},
};
Quoted 5 lines

// </smpl>

Cc Alan Cox <[email protected]> (maintainer:SERIAL DRIVERS)
Cc [email protected] (open list:SERIAL DRIVERS)

The () isn't needed, or nice, as I now need to edit this file by hand and remove that text. When applying 400+ patches in a single day, it gets old fast...

thanks,

greg k-h

#3 lore raw

PATCH 3/11 Input: Remove redundant spi driver bus initialization

In reply to Lars-Peter Clausen

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_driver_register(), so we can drop the manual assignment.

The patch was generated using the following coccinelle semantic patch:
// <smpl>
@@
identifier _driver;
@@

struct spi_driver _driver = {
	.driver = {
-		.bus = &spi_bus_type,
	},
};

// </smpl>

---
 drivers/input/misc/adxl34x-spi.c       |    1 -
 drivers/input/touchscreen/ad7877.c     |    1 -
 drivers/input/touchscreen/ad7879-spi.c |    1 -
 drivers/input/touchscreen/ads7846.c    |    1 -
 4 files changed, 0 insertions(+), 4 deletions(-)
drivers/input/misc/adxl34x-spi.c +0 -1
index f29de22..34d401e 100644
@@ -122,7 +122,6 @@ static SIMPLE_DEV_PM_OPS(adxl34x_spi_pm, adxl34x_spi_suspend,
 static struct spi_driver adxl34x_driver = {
 	.driver = {
 		.name = "adxl34x",
-		.bus = &spi_bus_type,
 		.owner = THIS_MODULE,
 		.pm = &adxl34x_spi_pm,
 	},
drivers/input/touchscreen/ad7877.c +0 -1
index 2da9f18..42ae7a2 100644
@@ -853,7 +853,6 @@ static SIMPLE_DEV_PM_OPS(ad7877_pm, ad7877_suspend, ad7877_resume);
 static struct spi_driver ad7877_driver = {
 	.driver = {
 		.name	= "ad7877",
-		.bus	= &spi_bus_type,
 		.owner	= THIS_MODULE,
 		.pm	= &ad7877_pm,
 	},
drivers/input/touchscreen/ad7879-spi.c +0 -1
index 8f391ff..9b2e1c2 100644
@@ -150,7 +150,6 @@ static int __devexit ad7879_spi_remove(struct spi_device *spi)
 static struct spi_driver ad7879_spi_driver = {
 	.driver = {
 		.name	= "ad7879",
-		.bus	= &spi_bus_type,
 		.owner	= THIS_MODULE,
 		.pm	= &ad7879_pm_ops,
 	},
drivers/input/touchscreen/ads7846.c +0 -1
index 4cedae6..23fd901 100644
@@ -1426,7 +1426,6 @@ static int __devexit ads7846_remove(struct spi_device *spi)
 static struct spi_driver ads7846_driver = {
 	.driver = {
 		.name	= "ads7846",
-		.bus	= &spi_bus_type,
 		.owner	= THIS_MODULE,
 		.pm	= &ads7846_pm,
 	},
Signature · 1 line
1.7.7.1
#4 lore raw

PATCH 4/11 hwmon: Remove redundant spi driver bus initialization

In reply to Lars-Peter Clausen

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_driver_register(), so we can drop the manual assignment.

The patch was generated using the following coccinelle semantic patch:
// <smpl>
@@
identifier _driver;
@@

struct spi_driver _driver = {
	.driver = {
-		.bus = &spi_bus_type,
	},
};

// </smpl>

---
 drivers/hwmon/ad7314.c  |    1 -
 drivers/hwmon/ads7871.c |    1 -
 2 files changed, 0 insertions(+), 2 deletions(-)
drivers/hwmon/ad7314.c +0 -1
index 318e38e..5d760f3 100644
@@ -160,7 +160,6 @@ MODULE_DEVICE_TABLE(spi, ad7314_id);
 static struct spi_driver ad7314_driver = {
 	.driver = {
 		.name = "ad7314",
-		.bus = &spi_bus_type,
 		.owner = THIS_MODULE,
 	},
 	.probe = ad7314_probe,
drivers/hwmon/ads7871.c +0 -1
index 5231934..04450f8 100644
@@ -227,7 +227,6 @@ static int __devexit ads7871_remove(struct spi_device *spi)
 static struct spi_driver ads7871_driver = {
 	.driver = {
 		.name = DEVICE_NAME,
-		.bus = &spi_bus_type,
 		.owner = THIS_MODULE,
 	},
 
Signature · 1 line
1.7.7.1
Acked-by on v1 4/11
#5 lore raw

Re: [PATCH 04/11] hwmon: Remove redundant spi driver bus initialization

Quoted 2 lines · Lars-Peter Clausen

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_driver_register(),

s/spi_driver_register/spi_register_driver/

Otherwise

Jean, ok if I take this and the others, or do you want to handle it ?

Guenter

Quoted 51 lines

so we can drop the manual assignment.

The patch was generated using the following coccinelle semantic patch:
// <smpl>
@@
identifier _driver;
@@

struct spi_driver _driver = {
	.driver = {
(quoted diff) +0 -1
-		.bus = &spi_bus_type,
	},
};

// </smpl>

---
 drivers/hwmon/ad7314.c  |    1 -
 drivers/hwmon/ads7871.c |    1 -
 2 files changed, 0 insertions(+), 2 deletions(-)
drivers/hwmon/ad7314.c +0 -1
index 318e38e..5d760f3 100644
@@ -160,7 +160,6 @@ MODULE_DEVICE_TABLE(spi, ad7314_id);
 static struct spi_driver ad7314_driver = {
 	.driver = {
 		.name = "ad7314",
-		.bus = &spi_bus_type,
 		.owner = THIS_MODULE,
 	},
 	.probe = ad7314_probe,
drivers/hwmon/ads7871.c +0 -1
index 5231934..04450f8 100644
@@ -227,7 +227,6 @@ static int __devexit ads7871_remove(struct spi_device *spi)
 static struct spi_driver ads7871_driver = {
 	.driver = {
 		.name = DEVICE_NAME,
-		.bus = &spi_bus_type,
 		.owner = THIS_MODULE,
 	},
 
Signature · 1 line
1.7.7.1
Signature · 8 lines
Guenter Roeck
Distinguished Engineer
PDU IP Systems

_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
#6 lore raw

Re: [PATCH 04/11] hwmon: Remove redundant spi driver bus initialization

Quoted 11 lines · Guenter Roeck
Quoted 2 lines · Lars-Peter Clausen

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_driver_register(),

s/spi_driver_register/spi_register_driver/

Otherwise

Jean, ok if I take this and the others, or do you want to handle it ?

Please take them.

Thanks,

Signature · 6 lines
Jean Delvare

_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
#7 lore raw

Re: [PATCH 04/11] hwmon: Remove redundant spi driver bus initialization

In reply to Lars-Peter Clausen
Quoted 14 lines · Lars-Peter Clausen

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_driver_register(), so we can drop the manual assignment.

The patch was generated using the following coccinelle semantic patch:
// <smpl>
@@
identifier _driver;
@@

struct spi_driver _driver = {
	.driver = {
(quoted diff) +0 -1
-		.bus = &spi_bus_type,
	},
};
Quoted 6 lines

// </smpl>

Applied.

Thanks,
Guenter

_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

#8 lore raw

PATCH 5/11 mfd: Remove redundant spi driver bus initialization

In reply to Lars-Peter Clausen

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_driver_register(), so we can drop the manual assignment.

The patch was generated using the following coccinelle semantic patch:
// <smpl>
@@
identifier _driver;
@@

struct spi_driver _driver = {
	.driver = {
-		.bus = &spi_bus_type,
	},
};

// </smpl>

---
 drivers/mfd/mc13xxx-core.c |    1 -
 drivers/mfd/tps65912-spi.c |    1 -
 drivers/mfd/wm831x-spi.c   |    1 -
 3 files changed, 0 insertions(+), 3 deletions(-)
drivers/mfd/mc13xxx-core.c +0 -1
index e9619ac..4417380 100644
@@ -805,7 +805,6 @@ static struct spi_driver mc13xxx_driver = {
 	.id_table = mc13xxx_device_id,
 	.driver = {
 		.name = "mc13xxx",
-		.bus = &spi_bus_type,
 		.owner = THIS_MODULE,
 	},
 	.probe = mc13xxx_probe,
drivers/mfd/tps65912-spi.c +0 -1
index 6d71e0d..27d3302 100644
@@ -111,7 +111,6 @@ static int __devexit tps65912_spi_remove(struct spi_device *spi)
 static struct spi_driver tps65912_spi_driver = {
 	.driver = {
 		.name = "tps65912",
-		.bus = &spi_bus_type,
 		.owner = THIS_MODULE,
 	},
 	.probe	= tps65912_spi_probe,
drivers/mfd/wm831x-spi.c +0 -1
index 8d6a9a9..37b3756 100644
@@ -95,7 +95,6 @@ MODULE_DEVICE_TABLE(spi, wm831x_spi_id);
 static struct spi_driver wm831x_spi_driver = {
 	.driver = {
 		.name	= "wm831x",
-		.bus	= &spi_bus_type,
 		.owner	= THIS_MODULE,
 		.pm	= &wm831x_spi_pm,
 	},
Signature · 1 line
1.7.7.1
Acked-by on v1 5/11
#9 lore raw

Re: [PATCH 05/11] mfd: Remove redundant spi driver bus initialization

Quoted 3 lines · Lars-Peter Clausen

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_driver_register(), so we can drop the manual assignment.

#10 lore raw

Re: [PATCH 05/11] mfd: Remove redundant spi driver bus initialization

In reply to Lars-Peter Clausen

Hi Lars,

Quoted 3 lines · Lars-Peter Clausen

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_driver_register(), so we can drop the manual assignment.

Thanks for the cleanup, I applied this one.

Cheers,
Samuel.

Signature · 2 lines
Intel Open Source Technology Centre
http://oss.intel.com/
#11 lore raw

PATCH 6/11 mtd: Remove redundant spi driver bus initialization

In reply to Lars-Peter Clausen

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_driver_register(), so we can drop the manual assignment.

The patch was generated using the following coccinelle semantic patch:
// <smpl>
@@
identifier _driver;
@@

struct spi_driver _driver = {
	.driver = {
-		.bus = &spi_bus_type,
	},
};

// </smpl>

---
 drivers/mtd/devices/m25p80.c        |    1 -
 drivers/mtd/devices/mtd_dataflash.c |    1 -
 drivers/mtd/devices/sst25l.c        |    1 -
 3 files changed, 0 insertions(+), 3 deletions(-)
drivers/mtd/devices/m25p80.c +0 -1
index 884904d..7c60ddd 100644
@@ -992,7 +992,6 @@ static int __devexit m25p_remove(struct spi_device *spi)
 static struct spi_driver m25p80_driver = {
 	.driver = {
 		.name	= "m25p80",
-		.bus	= &spi_bus_type,
 		.owner	= THIS_MODULE,
 	},
 	.id_table	= m25p_ids,
drivers/mtd/devices/mtd_dataflash.c +0 -1
index d75c7af..236057e 100644
@@ -936,7 +936,6 @@ static int __devexit dataflash_remove(struct spi_device *spi)
 static struct spi_driver dataflash_driver = {
 	.driver = {
 		.name		= "mtd_dataflash",
-		.bus		= &spi_bus_type,
 		.owner		= THIS_MODULE,
 		.of_match_table = dataflash_dt_ids,
 	},
drivers/mtd/devices/sst25l.c +0 -1
index d38ef3b..e45f62e 100644
@@ -444,7 +444,6 @@ static int __devexit sst25l_remove(struct spi_device *spi)
 static struct spi_driver sst25l_driver = {
 	.driver = {
 		.name	= "sst25l",
-		.bus	= &spi_bus_type,
 		.owner	= THIS_MODULE,
 	},
 	.probe		= sst25l_probe,
Signature · 1 line
1.7.7.1
#12 lore raw

Re: [PATCH 06/11] mtd: Remove redundant spi driver bus initialization

Quoted 3 lines · Lars-Peter Clausen

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_driver_register(), so we can drop the manual assignment.

Pushed to l2-mtd-2.6.git, thanks!

Artem.

#13 lore raw

PATCH 7/11 mmc: Remove redundant spi driver bus initialization

In reply to Lars-Peter Clausen

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_driver_register(), so we can drop the manual assignment.

The patch was generated using the following coccinelle semantic patch:
// <smpl>
@@
identifier _driver;
@@

struct spi_driver _driver = {
	.driver = {
-		.bus = &spi_bus_type,
	},
};

// </smpl>

---
 drivers/mmc/host/mmc_spi.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
drivers/mmc/host/mmc_spi.c +0 -1
index 92946b8..273306c 100644
@@ -1525,7 +1525,6 @@ static struct of_device_id mmc_spi_of_match_table[] __devinitdata = {
 static struct spi_driver mmc_spi_driver = {
 	.driver = {
 		.name =		"mmc_spi",
-		.bus =		&spi_bus_type,
 		.owner =	THIS_MODULE,
 		.of_match_table = mmc_spi_of_match_table,
 	},
Signature · 1 line
1.7.7.1
#14 lore raw

Re: [PATCH 07/11] mmc: Remove redundant spi driver bus initialization

Hi Lars,

Quoted 28 lines · Lars-Peter Clausen

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_driver_register(), so we can drop the manual assignment.

The patch was generated using the following coccinelle semantic patch:
// <smpl>
@@
identifier _driver;
@@

struct spi_driver _driver = {
	.driver = {
drivers/mmc/host/mmc_spi.c +0 -1
-		.bus = &spi_bus_type,
	},
};

// </smpl>

---
 drivers/mmc/host/mmc_spi.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
drivers/mmc/host/mmc_spi.c +0 -0
index 92946b8..273306c 100644

drivers/mmc/host/mmc_spi.c static struct of_device_id mmc_spi_of_match_table[] __devinitdata = { · line 1530

Quoted 7 lines
drivers/mmc/host/mmc_spi.c +0 -1
@@ -1525,7 +1525,6 @@ static struct of_device_id mmc_spi_of_match_table[] __devinitdata = {
 static struct spi_driver mmc_spi_driver = {
 	.driver = {
 		.name =		"mmc_spi",
-		.bus =		&spi_bus_type,
 		.owner =	THIS_MODULE,
 		.of_match_table = mmc_spi_of_match_table,
 	},

Thanks, pushed to mmc-next for 3.3.

- Chris.

Signature · 2 lines
Chris Ball   <[email protected]>   <http://printf.net/>
One Laptop Per Child
#15 lore raw

PATCH 8/11 blacklight: Remove redundant spi driver bus initialization

In reply to Lars-Peter Clausen

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_driver_register(), so we can drop the manual assignment.

The patch was generated using the following coccinelle semantic patch:
// <smpl>
@@
identifier _driver;
@@

struct spi_driver _driver = {
	.driver = {
-		.bus = &spi_bus_type,
	},
};

// </smpl>

Cc Richard Purdie <[email protected]>
Cc Andrew Morton <[email protected]>
---
 drivers/video/backlight/ams369fg06.c |    1 -
 drivers/video/backlight/ld9040.c     |    1 -
 drivers/video/backlight/ltv350qv.c   |    1 -
 drivers/video/backlight/s6e63m0.c    |    1 -
 4 files changed, 0 insertions(+), 4 deletions(-)
drivers/video/backlight/ams369fg06.c +0 -1
index 7838a23..901024b 100644
@@ -619,7 +619,6 @@ static void ams369fg06_shutdown(struct spi_device *spi)
 static struct spi_driver ams369fg06_driver = {
 	.driver = {
 		.name	= "ams369fg06",
-		.bus	= &spi_bus_type,
 		.owner	= THIS_MODULE,
 	},
 	.probe		= ams369fg06_probe,
drivers/video/backlight/ld9040.c +0 -1
index da9a5ce..158ba52 100644
@@ -799,7 +799,6 @@ static void ld9040_shutdown(struct spi_device *spi)
 static struct spi_driver ld9040_driver = {
 	.driver = {
 		.name	= "ld9040",
-		.bus	= &spi_bus_type,
 		.owner	= THIS_MODULE,
 	},
 	.probe		= ld9040_probe,
drivers/video/backlight/ltv350qv.c +0 -1
index cca43c0..707e66f 100644
@@ -310,7 +310,6 @@ static void ltv350qv_shutdown(struct spi_device *spi)
 static struct spi_driver ltv350qv_driver = {
 	.driver = {
 		.name		= "ltv350qv",
-		.bus		= &spi_bus_type,
 		.owner		= THIS_MODULE,
 	},
 
drivers/video/backlight/s6e63m0.c +0 -1
index e132157..6fb9187 100644
@@ -899,7 +899,6 @@ static void s6e63m0_shutdown(struct spi_device *spi)
 static struct spi_driver s6e63m0_driver = {
 	.driver = {
 		.name	= "s6e63m0",
-		.bus	= &spi_bus_type,
 		.owner	= THIS_MODULE,
 	},
 	.probe		= s6e63m0_probe,
Signature · 1 line
1.7.7.1
#16 lore raw

PATCH 9/11 video: Remove redundant spi driver bus initialization

In reply to Lars-Peter Clausen

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_driver_register(), so we can drop the manual assignment.

The patch was generated using the following coccinelle semantic patch:
// <smpl>
@@
identifier _driver;
@@

struct spi_driver _driver = {
	.driver = {
-		.bus = &spi_bus_type,
	},
};

// </smpl>

---
 drivers/video/omap/lcd_mipid.c                     |    1 -
 drivers/video/omap2/displays/panel-acx565akm.c     |    1 -
 drivers/video/omap2/displays/panel-n8x0.c          |    1 -
 .../omap2/displays/panel-nec-nl8048hl11-01b.c      |    1 -
 .../video/omap2/displays/panel-tpo-td043mtea1.c    |    1 -
 5 files changed, 0 insertions(+), 5 deletions(-)
drivers/video/omap/lcd_mipid.c +0 -1
index eb381db..8d546dd 100644
@@ -603,7 +603,6 @@ static int mipid_spi_remove(struct spi_device *spi)
 static struct spi_driver mipid_spi_driver = {
 	.driver = {
 		.name	= MIPID_MODULE_NAME,
-		.bus	= &spi_bus_type,
 		.owner	= THIS_MODULE,
 	},
 	.probe	= mipid_spi_probe,
drivers/video/omap2/displays/panel-acx565akm.c +0 -1
index dbd59b8..51a87e1 100644
@@ -803,7 +803,6 @@ static int acx565akm_spi_remove(struct spi_device *spi)
 static struct spi_driver acx565akm_spi_driver = {
 	.driver = {
 		.name	= "acx565akm",
-		.bus	= &spi_bus_type,
 		.owner	= THIS_MODULE,
 	},
 	.probe	= acx565akm_spi_probe,
drivers/video/omap2/displays/panel-n8x0.c +0 -1
index 150e8ba..dc9408d 100644
@@ -708,7 +708,6 @@ static int mipid_spi_remove(struct spi_device *spi)
 static struct spi_driver mipid_spi_driver = {
 	.driver = {
 		.name	= "lcd_mipid",
-		.bus	= &spi_bus_type,
 		.owner	= THIS_MODULE,
 	},
 	.probe	= mipid_spi_probe,
drivers/video/omap2/displays/panel-nec-nl8048hl11-01b.c +0 -1
index 2ba9d0c..8365e77 100644
@@ -303,7 +303,6 @@ static struct spi_driver nec_8048_spi_driver = {
 	.resume		= nec_8048_spi_resume,
 	.driver		= {
 		.name	= "nec_8048_spi",
-		.bus	= &spi_bus_type,
 		.owner	= THIS_MODULE,
 	},
 };
drivers/video/omap2/displays/panel-tpo-td043mtea1.c +0 -1
index 2462b9e..e6649aa 100644
@@ -512,7 +512,6 @@ static int __devexit tpo_td043_spi_remove(struct spi_device *spi)
 static struct spi_driver tpo_td043_spi_driver = {
 	.driver = {
 		.name	= "tpo_td043mtea1_panel_spi",
-		.bus	= &spi_bus_type,
 		.owner	= THIS_MODULE,
 	},
 	.probe	= tpo_td043_spi_probe,
Signature · 1 line
1.7.7.1
Acked-by on v1 9/11
#17 lore raw

Re: [PATCH 09/11] video: Remove redundant spi driver bus initialization

Quoted 14 lines · Lars-Peter Clausen

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_driver_register(), so we can drop the manual assignment.

The patch was generated using the following coccinelle semantic patch:
// <smpl>
@@
identifier _driver;
@@

struct spi_driver _driver = {
	.driver = {
(quoted diff) +0 -1
-		.bus = &spi_bus_type,
	},
};
Quoted 7 lines

// </smpl>

Tomi

#18 lore raw

Re: [PATCH 09/11] video: Remove redundant spi driver bus initialization

In reply to Lars-Peter Clausen
Quoted 14 lines · Lars-Peter Clausen

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_driver_register(), so we can drop the manual assignment.

The patch was generated using the following coccinelle semantic patch:
// <smpl>
@@
identifier _driver;
@@

struct spi_driver _driver = {
	.driver = {
(quoted diff) +0 -1
-		.bus = &spi_bus_type,
	},
};
Quoted 7 lines

// </smpl>

Applied this patch.

Thanks,

Florian Tobias Schandinat

Quoted 68 lines
---
 drivers/video/omap/lcd_mipid.c                     |    1 -
 drivers/video/omap2/displays/panel-acx565akm.c     |    1 -
 drivers/video/omap2/displays/panel-n8x0.c          |    1 -
 .../omap2/displays/panel-nec-nl8048hl11-01b.c      |    1 -
 .../video/omap2/displays/panel-tpo-td043mtea1.c    |    1 -
 5 files changed, 0 insertions(+), 5 deletions(-)
drivers/video/omap/lcd_mipid.c +0 -1
index eb381db..8d546dd 100644
@@ -603,7 +603,6 @@ static int mipid_spi_remove(struct spi_device *spi)
 static struct spi_driver mipid_spi_driver = {
 	.driver = {
 		.name	= MIPID_MODULE_NAME,
-		.bus	= &spi_bus_type,
 		.owner	= THIS_MODULE,
 	},
 	.probe	= mipid_spi_probe,
drivers/video/omap2/displays/panel-acx565akm.c +0 -1
index dbd59b8..51a87e1 100644
@@ -803,7 +803,6 @@ static int acx565akm_spi_remove(struct spi_device *spi)
 static struct spi_driver acx565akm_spi_driver = {
 	.driver = {
 		.name	= "acx565akm",
-		.bus	= &spi_bus_type,
 		.owner	= THIS_MODULE,
 	},
 	.probe	= acx565akm_spi_probe,
drivers/video/omap2/displays/panel-n8x0.c +0 -1
index 150e8ba..dc9408d 100644
@@ -708,7 +708,6 @@ static int mipid_spi_remove(struct spi_device *spi)
 static struct spi_driver mipid_spi_driver = {
 	.driver = {
 		.name	= "lcd_mipid",
-		.bus	= &spi_bus_type,
 		.owner	= THIS_MODULE,
 	},
 	.probe	= mipid_spi_probe,
drivers/video/omap2/displays/panel-nec-nl8048hl11-01b.c +0 -1
index 2ba9d0c..8365e77 100644
@@ -303,7 +303,6 @@ static struct spi_driver nec_8048_spi_driver = {
 	.resume		= nec_8048_spi_resume,
 	.driver		= {
 		.name	= "nec_8048_spi",
-		.bus	= &spi_bus_type,
 		.owner	= THIS_MODULE,
 	},
 };
drivers/video/omap2/displays/panel-tpo-td043mtea1.c +0 -1
index 2462b9e..e6649aa 100644
@@ -512,7 +512,6 @@ static int __devexit tpo_td043_spi_remove(struct spi_device *spi)
 static struct spi_driver tpo_td043_spi_driver = {
 	.driver = {
 		.name	= "tpo_td043mtea1_panel_spi",
-		.bus	= &spi_bus_type,
 		.owner	= THIS_MODULE,
 	},
 	.probe	= tpo_td043_spi_probe,
#19 lore raw

PATCH 10/11 wireless: Remove redundant spi driver bus initialization

In reply to Lars-Peter Clausen

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_driver_register(), so we can drop the manual assignment.

The patch was generated using the following coccinelle semantic patch:
// <smpl>
@@
identifier _driver;
@@

struct spi_driver _driver = {
	.driver = {
-		.bus = &spi_bus_type,
	},
};

// </smpl>

Cc Dan Williams <[email protected]>
Cc "John W. Linville" <[email protected]>
Cc Christian Lamparter <[email protected]>
Cc Luciano Coelho <[email protected]>
---
 drivers/net/wireless/libertas/if_spi.c |    1 -
 drivers/net/wireless/p54/p54spi.c      |    1 -
 drivers/net/wireless/wl1251/spi.c      |    1 -
 drivers/net/wireless/wl12xx/spi.c      |    1 -
 4 files changed, 0 insertions(+), 4 deletions(-)
drivers/net/wireless/libertas/if_spi.c +0 -1
index 728baa4..50b1ee7 100644
@@ -1291,7 +1291,6 @@ static struct spi_driver libertas_spi_driver = {
 	.remove = __devexit_p(libertas_spi_remove),
 	.driver = {
 		.name	= "libertas_spi",
-		.bus	= &spi_bus_type,
 		.owner	= THIS_MODULE,
 		.pm	= &if_spi_pm_ops,
 	},
drivers/net/wireless/p54/p54spi.c +0 -1
index 2d5cf5b..7faed62 100644
@@ -700,7 +700,6 @@ static int __devexit p54spi_remove(struct spi_device *spi)
 static struct spi_driver p54spi_driver = {
 	.driver = {
 		.name		= "p54spi",
-		.bus		= &spi_bus_type,
 		.owner		= THIS_MODULE,
 	},
 
drivers/net/wireless/wl1251/spi.c +0 -1
index eaa5f95..6248c35 100644
@@ -319,7 +319,6 @@ static int __devexit wl1251_spi_remove(struct spi_device *spi)
 static struct spi_driver wl1251_spi_driver = {
 	.driver = {
 		.name		= DRIVER_NAME,
-		.bus		= &spi_bus_type,
 		.owner		= THIS_MODULE,
 	},
 
drivers/net/wireless/wl12xx/spi.c +0 -1
index 0f97186..12421a6 100644
@@ -462,7 +462,6 @@ static int __devexit wl1271_remove(struct spi_device *spi)
 static struct spi_driver wl1271_spi_driver = {
 	.driver = {
 		.name		= "wl1271_spi",
-		.bus		= &spi_bus_type,
 		.owner		= THIS_MODULE,
 	},
 
Signature · 1 line
1.7.7.1
Acked-by on v1 10/11
#20 lore raw

Re: [PATCH 10/11] wireless: Remove redundant spi driver bus initialization

Quoted 24 lines · Lars-Peter Clausen

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_driver_register(), so we can drop the manual assignment.

The patch was generated using the following coccinelle semantic patch:
// <smpl>
@@
identifier _driver;
@@

struct spi_driver _driver = {
	.driver = {
(quoted diff) +0 -1
-		.bus = &spi_bus_type,
	},
};

// </smpl>

Cc Dan Williams <[email protected]>
Cc "John W. Linville" <[email protected]>
Cc Christian Lamparter <[email protected]>
Cc Luciano Coelho <[email protected]>

---

[...]

Quoted 17 lines
drivers/net/wireless/wl1251/spi.c +0 -1
index eaa5f95..6248c35 100644
@@ -319,7 +319,6 @@ static int __devexit wl1251_spi_remove(struct spi_device *spi)
 static struct spi_driver wl1251_spi_driver = {
 	.driver = {
 		.name		= DRIVER_NAME,
-		.bus		= &spi_bus_type,
 		.owner		= THIS_MODULE,
 	},
 
drivers/net/wireless/wl12xx/spi.c +0 -0
index 0f97186..12421a6 100644

drivers/net/wireless/wl12xx/spi.c static int __devexit wl1271_remove(struct spi_device *spi) · line 466

Quoted 6 lines
drivers/net/wireless/wl12xx/spi.c +0 -1
@@ -462,7 +462,6 @@ static int __devexit wl1271_remove(struct spi_device *spi)
 static struct spi_driver wl1271_spi_driver = {
 	.driver = {
 		.name		= "wl1271_spi",
-		.bus		= &spi_bus_type,
 		.owner		= THIS_MODULE,
 	},

For the wl12xx and wl1251 parts:

Signature · 2 lines
Cheers,
Luca.
#21 lore raw

PATCH 11/11 can: Remove redundant spi driver bus initialization

In reply to Lars-Peter Clausen

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_driver_register(), so we can drop the manual assignment.

The patch was generated using the following coccinelle semantic patch:
// <smpl>
@@
identifier _driver;
@@

struct spi_driver _driver = {
	.driver = {
-		.bus = &spi_bus_type,
	},
};

// </smpl>

---
 drivers/net/can/mcp251x.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
drivers/net/can/mcp251x.c +0 -1
index 330140e..5e10da5 100644
@@ -1185,7 +1185,6 @@ MODULE_DEVICE_TABLE(spi, mcp251x_id_table);
 static struct spi_driver mcp251x_can_driver = {
 	.driver = {
 		.name = DEVICE_NAME,
-		.bus = &spi_bus_type,
 		.owner = THIS_MODULE,
 	},
 
Signature · 1 line
1.7.7.1
maintainer Acked-by on v1 11/11
#22 lore raw

Re: [PATCH 11/11] can: Remove redundant spi driver bus initialization

Quoted 14 lines · Lars-Peter Clausen

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_driver_register(), so we can drop the manual assignment.

The patch was generated using the following coccinelle semantic patch:
// <smpl>
@@
identifier _driver;
@@

struct spi_driver _driver = {
	.driver = {
drivers/net/can/mcp251x.c +0 -1
-		.bus = &spi_bus_type,
	},
};
Quoted 5 lines

// </smpl>

Quoted 16 lines
---
 drivers/net/can/mcp251x.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
drivers/net/can/mcp251x.c +0 -1
index 330140e..5e10da5 100644
@@ -1185,7 +1185,6 @@ MODULE_DEVICE_TABLE(spi, mcp251x_id_table);
 static struct spi_driver mcp251x_can_driver = {
 	.driver = {
 		.name = DEVICE_NAME,
-		.bus = &spi_bus_type,
 		.owner = THIS_MODULE,
 	},
 
Signature · 4 lines
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |