]>
Commit | Line | Data |
---|---|---|
00e5a55c BS |
1 | Subject: gdth: Fixup section annotations |
2 | From: Hannes Reinecke <hare@suse.de> | |
3 | Date: Tue Sep 30 12:33:53 2008 +0200: | |
4 | Git: 833d622ac5002b5bcbcaae4dee335d3e80b84f28 | |
5 | ||
6 | Fixup section annotations so that kbuild doesn't complain anymore. | |
7 | ||
8 | Signed-off-by: Hannes Reinecke <hare@suse.de> | |
9 | ||
10 | diff --git a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c | |
11 | index 822d521..273e974 100644 | |
12 | --- a/drivers/scsi/gdth.c | |
13 | +++ b/drivers/scsi/gdth.c | |
14 | @@ -328,7 +328,7 @@ static int irq[MAXHA] __initdata = | |
15 | {0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, | |
16 | 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}; | |
17 | /* disable driver flag */ | |
18 | -static int disable __initdata = 0; | |
19 | +static int disable = 0; | |
20 | /* reserve flag */ | |
21 | static int reserve_mode = 1; | |
22 | /* reserve list */ | |
23 | @@ -589,7 +589,7 @@ static struct pci_driver gdth_pci_driver = { | |
24 | .remove = gdth_pci_remove_one, | |
25 | }; | |
26 | ||
27 | -static void gdth_pci_remove_one(struct pci_dev *pdev) | |
28 | +static void __devexit gdth_pci_remove_one(struct pci_dev *pdev) | |
29 | { | |
30 | gdth_ha_str *ha = pci_get_drvdata(pdev); | |
31 | ||
32 | @@ -601,7 +601,7 @@ static void gdth_pci_remove_one(struct pci_dev *pdev) | |
33 | pci_disable_device(pdev); | |
34 | } | |
35 | ||
36 | -static int gdth_pci_init_one(struct pci_dev *pdev, | |
37 | +static int __devinit gdth_pci_init_one(struct pci_dev *pdev, | |
38 | const struct pci_device_id *ent) | |
39 | { | |
40 | ushort vendor = pdev->vendor; | |
41 | @@ -659,7 +659,7 @@ static int gdth_pci_init_one(struct pci_dev *pdev, | |
42 | #endif /* CONFIG_PCI */ | |
43 | ||
44 | #ifdef CONFIG_EISA | |
45 | -static int __init gdth_init_eisa(ushort eisa_adr,gdth_ha_str *ha) | |
46 | +static int __devinit gdth_init_eisa(ushort eisa_adr,gdth_ha_str *ha) | |
47 | { | |
48 | ulong32 retries,id; | |
49 | unchar prot_ver,eisacf,i,irq_found; | |
50 | @@ -753,7 +753,7 @@ static int __init gdth_init_eisa(ushort eisa_adr,gdth_ha_str *ha) | |
51 | #endif /* CONFIG_EISA */ | |
52 | ||
53 | #ifdef CONFIG_ISA | |
54 | -static int __init gdth_init_isa(ulong32 bios_adr,gdth_ha_str *ha) | |
55 | +static int __devinit gdth_init_isa(ulong32 bios_adr,gdth_ha_str *ha) | |
56 | { | |
57 | register gdt2_dpram_str __iomem *dp2_ptr; | |
58 | int i; | |
59 | @@ -854,7 +854,7 @@ static int __init gdth_init_isa(ulong32 bios_adr,gdth_ha_str *ha) | |
60 | #endif /* CONFIG_ISA */ | |
61 | ||
62 | #ifdef CONFIG_PCI | |
63 | -static int gdth_init_pci(struct pci_dev *pdev, gdth_pci_str *pcistr, | |
64 | +static int __devinit gdth_init_pci(struct pci_dev *pdev, gdth_pci_str *pcistr, | |
65 | gdth_ha_str *ha) | |
66 | { | |
67 | register gdt6_dpram_str __iomem *dp6_ptr; | |
68 | @@ -1238,7 +1238,7 @@ static int gdth_init_pci(struct pci_dev *pdev, gdth_pci_str *pcistr, | |
69 | ||
70 | /* controller protocol functions */ | |
71 | ||
72 | -static void __init gdth_enable_int(gdth_ha_str *ha) | |
73 | +static void __devinit gdth_enable_int(gdth_ha_str *ha) | |
74 | { | |
75 | ulong flags; | |
76 | gdt2_dpram_str __iomem *dp2_ptr; | |
77 | @@ -1554,7 +1554,7 @@ static int gdth_internal_cmd(gdth_ha_str *ha, unchar service, ushort opcode, | |
78 | ||
79 | /* search for devices */ | |
80 | ||
81 | -static int __init gdth_search_drives(gdth_ha_str *ha) | |
82 | +static int __devinit gdth_search_drives(gdth_ha_str *ha) | |
83 | { | |
84 | ushort cdev_cnt, i; | |
85 | int ok; | |
86 | @@ -4654,7 +4654,7 @@ static struct scsi_host_template gdth_template = { | |
87 | }; | |
88 | ||
89 | #ifdef CONFIG_ISA | |
90 | -static int __init gdth_isa_probe_one(ulong32 isa_bios) | |
91 | +static int __devinit gdth_isa_probe_one(ulong32 isa_bios) | |
92 | { | |
93 | struct Scsi_Host *shp; | |
94 | gdth_ha_str *ha; | |
95 | @@ -4786,7 +4786,7 @@ static int __init gdth_isa_probe_one(ulong32 isa_bios) | |
96 | #endif /* CONFIG_ISA */ | |
97 | ||
98 | #ifdef CONFIG_EISA | |
99 | -static int __init gdth_eisa_probe_one(ushort eisa_slot) | |
100 | +static int __devinit gdth_eisa_probe_one(ushort eisa_slot) | |
101 | { | |
102 | struct Scsi_Host *shp; | |
103 | gdth_ha_str *ha; | |
104 | @@ -4919,7 +4919,7 @@ static int __init gdth_eisa_probe_one(ushort eisa_slot) | |
105 | #endif /* CONFIG_EISA */ | |
106 | ||
107 | #ifdef CONFIG_PCI | |
108 | -static int gdth_pci_probe_one(gdth_pci_str *pcistr, | |
109 | +static int __devinit gdth_pci_probe_one(gdth_pci_str *pcistr, | |
110 | gdth_ha_str **ha_out) | |
111 | { | |
112 | struct Scsi_Host *shp; | |
113 | @@ -5122,7 +5122,7 @@ static struct notifier_block gdth_notifier = { | |
114 | gdth_halt, NULL, 0 | |
115 | }; | |
116 | ||
117 | -static int __init gdth_init(void) | |
118 | +static int __devinit gdth_init(void) | |
119 | { | |
120 | if (disable) { | |
121 | printk("GDT-HA: Controller driver disabled from" | |
122 | @@ -5176,7 +5176,7 @@ static int __init gdth_init(void) | |
123 | return 0; | |
124 | } | |
125 | ||
126 | -static void __exit gdth_exit(void) | |
127 | +static void __devexit gdth_exit(void) | |
128 | { | |
129 | gdth_ha_str *ha; | |
130 |