aboutsummaryrefslogtreecommitdiffstats
path: root/dev_removal.patch
diff options
Diffstat (limited to 'dev_removal.patch')
-rw-r--r--dev_removal.patch372
1 files changed, 371 insertions, 1 deletions
diff --git a/dev_removal.patch b/dev_removal.patch
index 5aa627d8f859c0..26888827a32d85 100644
--- a/dev_removal.patch
+++ b/dev_removal.patch
@@ -61,11 +61,21 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/iio/magnetometer/hid-sensor-magn-3d.c | 4 +-
drivers/memory/tegra20-mc.c | 4 +-
drivers/memory/tegra30-mc.c | 4 +-
+ drivers/scsi/NCR_Q720.c | 2 -
drivers/scsi/a100u2w.c | 8 ++--
drivers/scsi/aacraid/linit.c | 15 ++-------
drivers/scsi/aic94xx/aic94xx_init.c | 23 ++++++--------
drivers/scsi/arm/cumana_2.c | 8 ++--
- 57 files changed, 248 insertions(+), 262 deletions(-)
+ drivers/scsi/bvme6000_scsi.c | 6 +--
+ drivers/scsi/ips.c | 10 +++---
+ drivers/scsi/jazz_esp.c | 6 +--
+ drivers/scsi/lasi700.c | 2 -
+ drivers/scsi/mac_esp.c | 6 +--
+ drivers/scsi/sni_53c710.c | 4 +-
+ drivers/scsi/stex.c | 5 +--
+ drivers/scsi/sun_esp.c | 30 ++++++++----------
+ drivers/scsi/zorro7xx.c | 12 +++----
+ 67 files changed, 288 insertions(+), 305 deletions(-)
--- a/drivers/ide/aec62xx.c
+++ b/drivers/ide/aec62xx.c
@@ -2096,6 +2106,17 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
{
struct resource *irq;
struct tegra30_mc *mc;
+--- a/drivers/scsi/NCR_Q720.c
++++ b/drivers/scsi/NCR_Q720.c
+@@ -351,7 +351,7 @@ static struct mca_driver NCR_Q720_driver
+ .name = "NCR_Q720",
+ .bus = &mca_bus_type,
+ .probe = NCR_Q720_probe,
+- .remove = __devexit_p(NCR_Q720_remove),
++ .remove = NCR_Q720_remove,
+ },
+ };
+
--- a/drivers/scsi/a100u2w.c
+++ b/drivers/scsi/a100u2w.c
@@ -1082,8 +1082,8 @@ static struct scsi_host_template inia100
@@ -2305,3 +2326,352 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
.id_table = cumanascsi2_cids,
.drv = {
.name = "cumanascsi2",
+--- a/drivers/scsi/bvme6000_scsi.c
++++ b/drivers/scsi/bvme6000_scsi.c
+@@ -34,7 +34,7 @@ static struct scsi_host_template bvme600
+
+ static struct platform_device *bvme6000_scsi_device;
+
+-static __devinit int
++static int
+ bvme6000_probe(struct platform_device *dev)
+ {
+ struct Scsi_Host *host;
+@@ -88,7 +88,7 @@ bvme6000_probe(struct platform_device *d
+ return -ENODEV;
+ }
+
+-static __devexit int
++static int
+ bvme6000_device_remove(struct platform_device *dev)
+ {
+ struct Scsi_Host *host = platform_get_drvdata(dev);
+@@ -108,7 +108,7 @@ static struct platform_driver bvme6000_s
+ .owner = THIS_MODULE,
+ },
+ .probe = bvme6000_probe,
+- .remove = __devexit_p(bvme6000_device_remove),
++ .remove = bvme6000_device_remove,
+ };
+
+ static int __init bvme6000_scsi_init(void)
+--- a/drivers/scsi/ips.c
++++ b/drivers/scsi/ips.c
+@@ -389,14 +389,14 @@ MODULE_DEVICE_TABLE( pci, ips_pci_table
+
+ static char ips_hot_plug_name[] = "ips";
+
+-static int __devinit ips_insert_device(struct pci_dev *pci_dev, const struct pci_device_id *ent);
+-static void __devexit ips_remove_device(struct pci_dev *pci_dev);
++static int ips_insert_device(struct pci_dev *pci_dev, const struct pci_device_id *ent);
++static void ips_remove_device(struct pci_dev *pci_dev);
+
+ static struct pci_driver ips_pci_driver = {
+ .name = ips_hot_plug_name,
+ .id_table = ips_pci_table,
+ .probe = ips_insert_device,
+- .remove = __devexit_p(ips_remove_device),
++ .remove = ips_remove_device,
+ };
+
+
+@@ -6837,7 +6837,7 @@ err_out_sh:
+ /* Routine Description: */
+ /* Remove one Adapter ( Hot Plugging ) */
+ /*---------------------------------------------------------------------------*/
+-static void __devexit
++static void
+ ips_remove_device(struct pci_dev *pci_dev)
+ {
+ struct Scsi_Host *sh = pci_get_drvdata(pci_dev);
+@@ -6898,7 +6898,7 @@ module_exit(ips_module_exit);
+ /* Return Value: */
+ /* 0 if Successful, else non-zero */
+ /*---------------------------------------------------------------------------*/
+-static int __devinit
++static int
+ ips_insert_device(struct pci_dev *pci_dev, const struct pci_device_id *ent)
+ {
+ int index = -1;
+--- a/drivers/scsi/jazz_esp.c
++++ b/drivers/scsi/jazz_esp.c
+@@ -129,7 +129,7 @@ static const struct esp_driver_ops jazz_
+ .dma_error = jazz_esp_dma_error,
+ };
+
+-static int __devinit esp_jazz_probe(struct platform_device *dev)
++static int esp_jazz_probe(struct platform_device *dev)
+ {
+ struct scsi_host_template *tpnt = &scsi_esp_template;
+ struct Scsi_Host *host;
+@@ -201,7 +201,7 @@ fail:
+ return err;
+ }
+
+-static int __devexit esp_jazz_remove(struct platform_device *dev)
++static int esp_jazz_remove(struct platform_device *dev)
+ {
+ struct esp *esp = dev_get_drvdata(&dev->dev);
+ unsigned int irq = esp->host->irq;
+@@ -223,7 +223,7 @@ MODULE_ALIAS("platform:jazz_esp");
+
+ static struct platform_driver esp_jazz_driver = {
+ .probe = esp_jazz_probe,
+- .remove = __devexit_p(esp_jazz_remove),
++ .remove = esp_jazz_remove,
+ .driver = {
+ .name = "jazz_esp",
+ .owner = THIS_MODULE,
+--- a/drivers/scsi/lasi700.c
++++ b/drivers/scsi/lasi700.c
+@@ -168,7 +168,7 @@ static struct parisc_driver lasi700_driv
+ .name = "lasi_scsi",
+ .id_table = lasi700_ids,
+ .probe = lasi700_probe,
+- .remove = __devexit_p(lasi700_driver_remove),
++ .remove = lasi700_driver_remove,
+ };
+
+ static int __init
+--- a/drivers/scsi/mac_esp.c
++++ b/drivers/scsi/mac_esp.c
+@@ -481,7 +481,7 @@ static struct esp_driver_ops mac_esp_ops
+ .dma_error = mac_esp_dma_error,
+ };
+
+-static int __devinit esp_mac_probe(struct platform_device *dev)
++static int esp_mac_probe(struct platform_device *dev)
+ {
+ struct scsi_host_template *tpnt = &scsi_esp_template;
+ struct Scsi_Host *host;
+@@ -591,7 +591,7 @@ fail:
+ return err;
+ }
+
+-static int __devexit esp_mac_remove(struct platform_device *dev)
++static int esp_mac_remove(struct platform_device *dev)
+ {
+ struct mac_esp_priv *mep = platform_get_drvdata(dev);
+ struct esp *esp = mep->esp;
+@@ -614,7 +614,7 @@ static int __devexit esp_mac_remove(stru
+
+ static struct platform_driver esp_mac_driver = {
+ .probe = esp_mac_probe,
+- .remove = __devexit_p(esp_mac_remove),
++ .remove = esp_mac_remove,
+ .driver = {
+ .name = DRV_MODULE_NAME,
+ .owner = THIS_MODULE,
+--- a/drivers/scsi/sni_53c710.c
++++ b/drivers/scsi/sni_53c710.c
+@@ -65,7 +65,7 @@ static struct scsi_host_template snirm71
+ .module = THIS_MODULE,
+ };
+
+-static int __devinit snirm710_probe(struct platform_device *dev)
++static int snirm710_probe(struct platform_device *dev)
+ {
+ unsigned long base;
+ struct NCR_700_Host_Parameters *hostdata;
+@@ -134,7 +134,7 @@ static int __exit snirm710_driver_remove
+
+ static struct platform_driver snirm710_driver = {
+ .probe = snirm710_probe,
+- .remove = __devexit_p(snirm710_driver_remove),
++ .remove = snirm710_driver_remove,
+ .driver = {
+ .name = "snirm_53c710",
+ .owner = THIS_MODULE,
+--- a/drivers/scsi/stex.c
++++ b/drivers/scsi/stex.c
+@@ -1540,8 +1540,7 @@ static void stex_free_irq(struct st_hba
+ pci_disable_msi(pdev);
+ }
+
+-static int __devinit
+-stex_probe(struct pci_dev *pdev, const struct pci_device_id *id)
++static int stex_probe(struct pci_dev *pdev, const struct pci_device_id *id)
+ {
+ struct st_hba *hba;
+ struct Scsi_Host *host;
+@@ -1815,7 +1814,7 @@ static struct pci_driver stex_pci_driver
+ .name = DRV_NAME,
+ .id_table = stex_pci_tbl,
+ .probe = stex_probe,
+- .remove = __devexit_p(stex_remove),
++ .remove = stex_remove,
+ .shutdown = stex_shutdown,
+ };
+
+--- a/drivers/scsi/sun_esp.c
++++ b/drivers/scsi/sun_esp.c
+@@ -43,8 +43,7 @@ enum dvma_rev {
+ dvmahme
+ };
+
+-static int __devinit esp_sbus_setup_dma(struct esp *esp,
+- struct platform_device *dma_of)
++static int esp_sbus_setup_dma(struct esp *esp, struct platform_device *dma_of)
+ {
+ esp->dma = dma_of;
+
+@@ -79,7 +78,7 @@ static int __devinit esp_sbus_setup_dma(
+
+ }
+
+-static int __devinit esp_sbus_map_regs(struct esp *esp, int hme)
++static int esp_sbus_map_regs(struct esp *esp, int hme)
+ {
+ struct platform_device *op = esp->dev;
+ struct resource *res;
+@@ -99,7 +98,7 @@ static int __devinit esp_sbus_map_regs(s
+ return 0;
+ }
+
+-static int __devinit esp_sbus_map_command_block(struct esp *esp)
++static int esp_sbus_map_command_block(struct esp *esp)
+ {
+ struct platform_device *op = esp->dev;
+
+@@ -111,7 +110,7 @@ static int __devinit esp_sbus_map_comman
+ return 0;
+ }
+
+-static int __devinit esp_sbus_register_irq(struct esp *esp)
++static int esp_sbus_register_irq(struct esp *esp)
+ {
+ struct Scsi_Host *host = esp->host;
+ struct platform_device *op = esp->dev;
+@@ -120,7 +119,7 @@ static int __devinit esp_sbus_register_i
+ return request_irq(host->irq, scsi_esp_intr, IRQF_SHARED, "ESP", esp);
+ }
+
+-static void __devinit esp_get_scsi_id(struct esp *esp, struct platform_device *espdma)
++static void esp_get_scsi_id(struct esp *esp, struct platform_device *espdma)
+ {
+ struct platform_device *op = esp->dev;
+ struct device_node *dp;
+@@ -142,7 +141,7 @@ done:
+ esp->scsi_id_mask = (1 << esp->scsi_id);
+ }
+
+-static void __devinit esp_get_differential(struct esp *esp)
++static void esp_get_differential(struct esp *esp)
+ {
+ struct platform_device *op = esp->dev;
+ struct device_node *dp;
+@@ -154,7 +153,7 @@ static void __devinit esp_get_differenti
+ esp->flags &= ~ESP_FLAG_DIFFERENTIAL;
+ }
+
+-static void __devinit esp_get_clock_params(struct esp *esp)
++static void esp_get_clock_params(struct esp *esp)
+ {
+ struct platform_device *op = esp->dev;
+ struct device_node *bus_dp, *dp;
+@@ -170,7 +169,7 @@ static void __devinit esp_get_clock_para
+ esp->cfreq = fmhz;
+ }
+
+-static void __devinit esp_get_bursts(struct esp *esp, struct platform_device *dma_of)
++static void esp_get_bursts(struct esp *esp, struct platform_device *dma_of)
+ {
+ struct device_node *dma_dp = dma_of->dev.of_node;
+ struct platform_device *op = esp->dev;
+@@ -195,7 +194,7 @@ static void __devinit esp_get_bursts(str
+ esp->bursts = bursts;
+ }
+
+-static void __devinit esp_sbus_get_props(struct esp *esp, struct platform_device *espdma)
++static void esp_sbus_get_props(struct esp *esp, struct platform_device *espdma)
+ {
+ esp_get_scsi_id(esp, espdma);
+ esp_get_differential(esp);
+@@ -487,9 +486,8 @@ static const struct esp_driver_ops sbus_
+ .dma_error = sbus_esp_dma_error,
+ };
+
+-static int __devinit esp_sbus_probe_one(struct platform_device *op,
+- struct platform_device *espdma,
+- int hme)
++static int esp_sbus_probe_one(struct platform_device *op,
++ struct platform_device *espdma, int hme)
+ {
+ struct scsi_host_template *tpnt = &scsi_esp_template;
+ struct Scsi_Host *host;
+@@ -562,7 +560,7 @@ fail:
+ return err;
+ }
+
+-static int __devinit esp_sbus_probe(struct platform_device *op)
++static int esp_sbus_probe(struct platform_device *op)
+ {
+ struct device_node *dma_node = NULL;
+ struct device_node *dp = op->dev.of_node;
+@@ -585,7 +583,7 @@ static int __devinit esp_sbus_probe(stru
+ return esp_sbus_probe_one(op, dma_of, hme);
+ }
+
+-static int __devexit esp_sbus_remove(struct platform_device *op)
++static int esp_sbus_remove(struct platform_device *op)
+ {
+ struct esp *esp = dev_get_drvdata(&op->dev);
+ struct platform_device *dma_of = esp->dma;
+@@ -639,7 +637,7 @@ static struct platform_driver esp_sbus_d
+ .of_match_table = esp_match,
+ },
+ .probe = esp_sbus_probe,
+- .remove = __devexit_p(esp_sbus_remove),
++ .remove = esp_sbus_remove,
+ };
+
+ static int __init sunesp_init(void)
+--- a/drivers/scsi/zorro7xx.c
++++ b/drivers/scsi/zorro7xx.c
+@@ -38,7 +38,7 @@ static struct zorro_driver_data {
+ const char *name;
+ unsigned long offset;
+ int absolute; /* offset is absolute address */
+-} zorro7xx_driver_data[] __devinitdata = {
++} zorro7xx_driver_data[] = {
+ { .name = "PowerUP 603e+", .offset = 0xf40000, .absolute = 1 },
+ { .name = "WarpEngine 40xx", .offset = 0x40000 },
+ { .name = "A4091", .offset = 0x800000 },
+@@ -46,7 +46,7 @@ static struct zorro_driver_data {
+ { 0 }
+ };
+
+-static struct zorro_device_id zorro7xx_zorro_tbl[] __devinitdata = {
++static struct zorro_device_id zorro7xx_zorro_tbl[] = {
+ {
+ .id = ZORRO_PROD_PHASE5_BLIZZARD_603E_PLUS,
+ .driver_data = (unsigned long)&zorro7xx_driver_data[0],
+@@ -71,8 +71,8 @@ static struct zorro_device_id zorro7xx_z
+ };
+ MODULE_DEVICE_TABLE(zorro, zorro7xx_zorro_tbl);
+
+-static int __devinit zorro7xx_init_one(struct zorro_dev *z,
+- const struct zorro_device_id *ent)
++static int zorro7xx_init_one(struct zorro_dev *z,
++ const struct zorro_device_id *ent)
+ {
+ struct Scsi_Host *host;
+ struct NCR_700_Host_Parameters *hostdata;
+@@ -150,7 +150,7 @@ static int __devinit zorro7xx_init_one(s
+ return -ENODEV;
+ }
+
+-static __devexit void zorro7xx_remove_one(struct zorro_dev *z)
++static void zorro7xx_remove_one(struct zorro_dev *z)
+ {
+ struct Scsi_Host *host = zorro_get_drvdata(z);
+ struct NCR_700_Host_Parameters *hostdata = shost_priv(host);
+@@ -167,7 +167,7 @@ static struct zorro_driver zorro7xx_driv
+ .name = "zorro7xx-scsi",
+ .id_table = zorro7xx_zorro_tbl,
+ .probe = zorro7xx_init_one,
+- .remove = __devexit_p(zorro7xx_remove_one),
++ .remove = zorro7xx_remove_one,
+ };
+
+ static int __init zorro7xx_scsi_init(void)
generated by cgit 1.2.3-korg (git 2.43.0) at 2026-03-01 19:03:37 +0000