gdth: Fixup section annotations
PATCH 1/1 gdth: Fixup section annotations
Fixup section annotations so that kbuild doesn't complain anymore.
--- drivers/scsi/gdth.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/scsi/gdth.c +7 -7
@@ -329,7 +329,7 @@ static int irq[MAXHA] __initdata = {0xff ,0xff ,0xff ,0xff ,0xff ,0xff ,0xff ,0xff , 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff};/* disable driver flag */ -static int disable__initdata =0 ; +static int disable =0 ;/* reserve flag */ static int reserve_mode =1 ;/* reserve list */
@@ -658,7 +658,7 @@ static int gdth_pci_init_one(struct pci_dev *pdev,#endif /* CONFIG_PCI */ #ifdef CONFIG_EISA -static int __init gdth_init_eisa (u16 eisa_adr,gdth_ha_str *ha) +static int __devinit gdth_init_eisa (u16 eisa_adr,gdth_ha_str *ha) {u32 retries,id;u8 prot_ver,eisacf,i,irq_found;
@@ -752,7 +752,7 @@ static int __init gdth_init_eisa(u16 eisa_adr,gdth_ha_str *ha)#endif /* CONFIG_EISA */ #ifdef CONFIG_ISA -static int __init gdth_init_isa (u32 bios_adr,gdth_ha_str *ha) +static int __devinit gdth_init_isa (u32 bios_adr,gdth_ha_str *ha) { registergdt2_dpram_str __iomem *dp2_ptr;int i;
@@ -4688,7 +4688,7 @@ static struct scsi_host_template gdth_template = { };#ifdef CONFIG_ISA -static int __init gdth_isa_probe_one (u32 isa_bios) +static int __devinit gdth_isa_probe_one (u32 isa_bios) {struct Scsi_Host *shp;gdth_ha_str *ha;
@@ -4820,7 +4820,7 @@ static int __init gdth_isa_probe_one(u32 isa_bios)#endif /* CONFIG_ISA */ #ifdef CONFIG_EISA -static int __init gdth_eisa_probe_one (u16 eisa_slot) +static int __devinit gdth_eisa_probe_one (u16 eisa_slot) {struct Scsi_Host *shp;gdth_ha_str *ha;
@@ -5155,7 +5155,7 @@ static struct notifier_block gdth_notifier = { gdth_halt,NULL ,0 }; -static int __init gdth_init (void ) +static int __devinit gdth_init (void ) {if (disable) { printk("GDT-HA: Controller driver disabled from"
@@ -5209,7 +5209,7 @@ static int __init gdth_init(void)return 0 ; } -static void __exit gdth_exit(void) +static void __devexit gdth_exit(void) {gdth_ha_str *ha;
Signature · 1 line
1.7.12.4
Quoted 1 line · Hannes Reinecke
Fixup section annotations so that kbuild doesn't complain anymore.
This doesn't look right: __devinit is now an obsolete annotation.
James
Quoted 5 lines · James Bottomley
Quoted 1 line · Hannes Reinecke
Fixup section annotations so that kbuild doesn't complain anymore.
This doesn't look right:
__devinitis now an obsolete annotation.
Hmm. Patch has been in our internal kernel repository for ages. I'll be checking.
Cheers,
Hannes
Signature · 8 lines
Dr. Hannes Reinecke zSeries & Storage [email protected] +49 911 74053 688 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg GF: J. Hawn, J. Guild, F. Imendörffer, HRB 16746 (AG Nürnberg) -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 8 lines · Hannes Reinecke
Quoted 5 lines · James Bottomley
Quoted 1 line · Hannes Reinecke
Fixup section annotations so that kbuild doesn't complain anymore.
This doesn't look right:
__devinitis now an obsolete annotation.Hmm. Patch has been in our internal kernel repository for ages. I'll be checking.
We fixed all the __dev section horrors by simply eliminating CONFIG_HOTPLUG. After that, the compiler and linker should notice sectional problems (basically around init and exit sections), so either the patch is obsolete, or there is some residue after all the __dev... sections are removed that is still needed.
James