introduce __devinitconst
PATCH 3/4 introduce __devinitconst
The drivers picked just serve as examples (which I routinely build and hence am able to easily verify), i.e. as before he patch doesn't change all instances where 'const' could have been added as a result of the base change, only where the change has a real effect (the module loader doesn't enforce read-only section attributes at present, so only built-in files make a real difference).
For the PCI ID tables a change like this could probably be done almost globally in drivers/.
The cleaning up of all the invalid uses of 'const' and '__devinitdata' on the same object could likewise be done in an almost global fashion, although drivers/ide/pci/ seems to be the most significant violator.
--- drivers/i2c/busses/i2c-piix4.c | 4 ++-- drivers/ide/pci/piix.c | 2 +- drivers/video/aty/aty128fb.c | 2 +- include/linux/init.h | 2 ++ 4 files changed, 6 insertions(+), 4 deletions(-)
drivers/i2c/busses/i2c-piix4.c +2 -2
@@ -108,7 +108,7 @@ static unsigned short piix4_smba;static struct pci_driver piix4_driver;static struct i2c_adapter piix4_adapter; -static struct dmi_system_id __devinitdata piix4_dmi_table[] = { +static struct dmi_system_id __devinitconst piix4_dmi_table[] = { { .ident ="IBM" , .matches = {DMI_MATCH (DMI_SYS_VENDOR ,"IBM" ), },
@@ -388,7 +388,7 @@ static struct i2c_adapter piix4_adapter .algo = &smbus_algorithm, }; -static struct pci_device_id piix4_ids[] = { +static struct pci_device_id __devinitconst piix4_ids[] = { {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_82371AB_3 ), .driver_data =3 }, {PCI_DEVICE (PCI_VENDOR_ID_ATI ,PCI_DEVICE_ID_ATI_IXP200_SMBUS ),
drivers/ide/pci/piix.c +1 -1
@@ -398,7 +398,7 @@ static void __devinit init_hwif_ich(ide_ .udma_mask = udma, \ } -static const struct ide_port_info piix_pci_info[]__devinitdata = { +static struct ide_port_info __devinitconst piix_pci_info[] = {/* 0 */ DECLARE_PIIX_DEV ("PIIXa" ,0x00 ),/* no udma */ /* 1 */ DECLARE_PIIX_DEV ("PIIXb" ,0x00 ),/* no udma */
drivers/video/aty/aty128fb.c +1 -1
@@ -149,7 +149,7 @@ enum { };/* Must match above enum */ -static const char *r128_family[]__devinitdata = { +static const char *__devinitconst r128_family[] = {"AGP" ,"PCI" ,"PRO AGP" ,
include/linux/init.h +2 -0
@@ -257,11 +257,13 @@ void __init parse_early_param(void);#ifdef CONFIG_HOTPLUG #define __devinit#define __devinitdata +#define __devinitconst const#define __devexit#define __devexitdata#else #define __devinit __init#define __devinitdata __initdata +#define __devinitconst __initdata#define __devexit __exit#define __devexitdata __exitdata#endif
Quoted 6 lines · Jan Beulich
The drivers picked just serve as examples (which I routinely build and hence am able to easily verify), i.e. as before he patch doesn't change all instances where 'const' could have been added as a result of the base change, only where the change has a real effect (the module loader doesn't enforce read-only section attributes at present, so only built-in files make a real difference).
What does this buy us?
include/linux/init.h void __init parse_early_param(void); · line 266
Quoted 13 lines
include/linux/init.h +2
-0@@ -257,11 +257,13 @@ void __init parse_early_param(void);#ifdef CONFIG_HOTPLUG #define __devinit#define __devinitdata +#define __devinitconst const#define __devexit#define __devexitdata#else #define __devinit __init#define __devinitdata __initdata +#define __devinitconst __initdata
Shoudn't that be "__initdata const" or something like that?
thanks,
greg k-h
Quoted 10 lines
Quoted 1 line
Quoted 1 line
Greg KH <[email protected]> 19.01.08 02:28 >>>
Quoted 6 lines · Jan Beulich
The drivers picked just serve as examples (which I routinely build and hence am able to easily verify), i.e. as before he patch doesn't change all instances where 'const' could have been added as a result of the base change, only where the change has a real effect (the module loader doesn't enforce read-only section attributes at present, so only built-in files make a real difference).
What does this buy us?
Not sure what part the question applies to...
Quoted 7 lines
Quoted 7 lines
include/linux/init.h +1
-0@@ -257,11 +257,13 @@ void __init parse_early_param(void);#ifdef CONFIG_HOTPLUG #define __devinit#define __devinitdata +#define __devinitconst const
Quoted 8 lines
include/linux/init.h void __init parse_early_param(void); · line 266
Quoted 6 lines
include/linux/init.h +1
-0#define __devexit#define __devexitdata#else #define __devinit __init#define __devinitdata __initdata +#define __devinitconst __initdataShoudn't that be "
__initdataconst" or something like that?
No, specifically not, as otherwise this will report in 'section type conflict' compiler (or assembler?) warnings.
But Sam's concept addresses this in a neater way anyway, so my current take is that I'll resubmit any parts needed after he's got his patch in.
Jan