Skip to content

L
linux
Commit 60d5a7ea authored by Dave Jones's avatar Dave Jones Committed by Dave Jones
Browse files
Options

[AGP] __init audit after Rusty found a bug.

parent 37733200
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 41 deletions
drivers/char/agp/ali-agp.c
View file @ 60d5a7ea
...@@ -195,7 +195,7 @@ static struct aper_size_info_32 ali_generic_sizes[7] = ...@@ -195,7 +195,7 @@ static struct aper_size_info_32 ali_generic_sizes[7] =
{4, 1024, 0, 3} {4, 1024, 0, 3}
}; };
int __init ali_generic_setup (struct pci_dev *pdev) static int __init ali_generic_setup (struct pci_dev *pdev)
{ {
agp_bridge.masks = ali_generic_masks; agp_bridge.masks = ali_generic_masks;
agp_bridge.num_of_masks = 1; agp_bridge.num_of_masks = 1;
...@@ -338,9 +338,7 @@ static int __init agp_lookup_host_bridge (struct pci_dev *pdev) ...@@ -338,9 +338,7 @@ static int __init agp_lookup_host_bridge (struct pci_dev *pdev)
} }
static int __init agp_ali_probe (struct pci_dev *dev, const struct pci_device_id *ent)
static int agp_ali_probe (struct pci_dev *dev, const struct pci_device_id *ent)
{ {
u8 cap_ptr = 0; u8 cap_ptr = 0;
...@@ -374,7 +372,7 @@ static struct pci_device_id agp_ali_pci_table[] __initdata = { ...@@ -374,7 +372,7 @@ static struct pci_device_id agp_ali_pci_table[] __initdata = {
MODULE_DEVICE_TABLE(pci, agp_ali_pci_table); MODULE_DEVICE_TABLE(pci, agp_ali_pci_table);
static struct pci_driver agp_ali_pci_driver = { static struct __initdata pci_driver agp_ali_pci_driver = {
.name = "agpgart-ali", .name = "agpgart-ali",
.id_table = agp_ali_pci_table, .id_table = agp_ali_pci_table,
.probe = agp_ali_probe, .probe = agp_ali_probe,
......
drivers/char/agp/amd-k7-agp.c
View file @ 60d5a7ea
...@@ -351,7 +351,7 @@ static struct gatt_mask amd_irongate_masks[] = ...@@ -351,7 +351,7 @@ static struct gatt_mask amd_irongate_masks[] =
{.mask = 0x00000001, .type = 0} {.mask = 0x00000001, .type = 0}
}; };
int __init amd_irongate_setup (struct pci_dev *pdev) static int __init amd_irongate_setup (struct pci_dev *pdev)
{ {
agp_bridge.masks = amd_irongate_masks; agp_bridge.masks = amd_irongate_masks;
agp_bridge.num_of_masks = 1; agp_bridge.num_of_masks = 1;
...@@ -439,7 +439,7 @@ static int __init agp_lookup_host_bridge (struct pci_dev *pdev) ...@@ -439,7 +439,7 @@ static int __init agp_lookup_host_bridge (struct pci_dev *pdev)
/* Supported Device Scanning routine */ /* Supported Device Scanning routine */
static int agp_amdk7_probe (struct pci_dev *dev, const struct pci_device_id *ent) static int __init agp_amdk7_probe (struct pci_dev *dev, const struct pci_device_id *ent)
{ {
u8 cap_ptr = 0; u8 cap_ptr = 0;
...@@ -472,7 +472,7 @@ static struct pci_device_id agp_amdk7_pci_table[] __initdata = { ...@@ -472,7 +472,7 @@ static struct pci_device_id agp_amdk7_pci_table[] __initdata = {
MODULE_DEVICE_TABLE(pci, agp_amdk7_pci_table); MODULE_DEVICE_TABLE(pci, agp_amdk7_pci_table);
static struct pci_driver agp_amdk7_pci_driver = { static struct __initdata pci_driver agp_amdk7_pci_driver = {
.name = "agpgart-amdk7", .name = "agpgart-amdk7",
.id_table = agp_amdk7_pci_table, .id_table = agp_amdk7_pci_table,
.probe = agp_amdk7_probe, .probe = agp_amdk7_probe,
......
drivers/char/agp/amd-k8-agp.c
View file @ 60d5a7ea
...@@ -475,7 +475,7 @@ static int __init amd_8151_setup (struct pci_dev *pdev) ...@@ -475,7 +475,7 @@ static int __init amd_8151_setup (struct pci_dev *pdev)
} }
static int agp_amdk8_probe (struct pci_dev *dev, const struct pci_device_id *ent) static int __init agp_amdk8_probe (struct pci_dev *dev, const struct pci_device_id *ent)
{ {
u8 cap_ptr = 0; u8 cap_ptr = 0;
...@@ -507,7 +507,7 @@ static struct pci_device_id agp_amdk8_pci_table[] __initdata = { ...@@ -507,7 +507,7 @@ static struct pci_device_id agp_amdk8_pci_table[] __initdata = {
MODULE_DEVICE_TABLE(pci, agp_amdk8_pci_table); MODULE_DEVICE_TABLE(pci, agp_amdk8_pci_table);
static struct pci_driver agp_amdk8_pci_driver = { static struct __initdata pci_driver agp_amdk8_pci_driver = {
.name = "agpgart-amd-k8", .name = "agpgart-amd-k8",
.id_table = agp_amdk8_pci_table, .id_table = agp_amdk8_pci_table,
.probe = agp_amdk8_probe, .probe = agp_amdk8_probe,
......
drivers/char/agp/backend.c
View file @ 60d5a7ea
...@@ -112,7 +112,7 @@ static struct agp_version agp_current_version = ...@@ -112,7 +112,7 @@ static struct agp_version agp_current_version =
.minor = AGPGART_VERSION_MINOR, .minor = AGPGART_VERSION_MINOR,
}; };
static int __init agp_backend_initialize(struct pci_dev *dev) static int agp_backend_initialize(struct pci_dev *dev)
{ {
int size_value, rc, got_gatt=0, got_keylist=0; int size_value, rc, got_gatt=0, got_keylist=0;
...@@ -262,13 +262,6 @@ int agp_unregister_driver(void) ...@@ -262,13 +262,6 @@ int agp_unregister_driver(void)
return 0; return 0;
} }
int __exit agp_exit(void)
{
if (agp_count==0)
return -EBUSY;
return 0;
}
int __init agp_init(void) int __init agp_init(void)
{ {
...@@ -289,7 +282,6 @@ int __init agp_init(void) ...@@ -289,7 +282,6 @@ int __init agp_init(void)
#ifndef CONFIG_GART_IOMMU #ifndef CONFIG_GART_IOMMU
module_init(agp_init); module_init(agp_init);
module_exit(agp_exit);
#endif #endif
EXPORT_SYMBOL(agp_backend_acquire); EXPORT_SYMBOL(agp_backend_acquire);
......
drivers/char/agp/hp-agp.c
View file @ 60d5a7ea
...@@ -329,7 +329,7 @@ static unsigned long hp_zx1_mask_memory(unsigned long addr, int type) ...@@ -329,7 +329,7 @@ static unsigned long hp_zx1_mask_memory(unsigned long addr, int type)
return HP_ZX1_PDIR_VALID_BIT | addr; return HP_ZX1_PDIR_VALID_BIT | addr;
} }
int __init hp_zx1_setup (struct pci_dev *pdev __attribute__((unused))) static int __init hp_zx1_setup (struct pci_dev *pdev __attribute__((unused)))
{ {
agp_bridge.masks = hp_zx1_masks; agp_bridge.masks = hp_zx1_masks;
agp_bridge.num_of_masks = 1; agp_bridge.num_of_masks = 1;
...@@ -369,7 +369,7 @@ static int __init agp_find_supported_device(struct pci_dev *dev) ...@@ -369,7 +369,7 @@ static int __init agp_find_supported_device(struct pci_dev *dev)
} }
return -ENODEV; return -ENODEV;
static int agp_hp_probe (struct pci_dev *dev, const struct pci_device_id *ent) static int __init agp_hp_probe (struct pci_dev *dev, const struct pci_device_id *ent)
{ {
if (agp_find_supported_device(dev) == 0) { if (agp_find_supported_device(dev) == 0) {
agp_register_driver(dev); agp_register_driver(dev);
...@@ -392,7 +392,7 @@ static struct pci_device_id agp_hp_pci_table[] __initdata = { ...@@ -392,7 +392,7 @@ static struct pci_device_id agp_hp_pci_table[] __initdata = {
MODULE_DEVICE_TABLE(pci, agp_pci_table); MODULE_DEVICE_TABLE(pci, agp_pci_table);
static struct pci_driver agp_hp_pci_driver = { static struct __initdata pci_driver agp_hp_pci_driver = {
.name = "agpgart-hp", .name = "agpgart-hp",
.id_table = agp_hp_pci_table, .id_table = agp_hp_pci_table,
.probe = agp_hp_probe, .probe = agp_hp_probe,
......
drivers/char/agp/i460-agp.c
View file @ 60d5a7ea
...@@ -523,7 +523,7 @@ static unsigned long i460_mask_memory (unsigned long addr, int type) ...@@ -523,7 +523,7 @@ static unsigned long i460_mask_memory (unsigned long addr, int type)
| (((addr & ~((1 << I460_IO_PAGE_SHIFT) - 1)) & 0xffffff000) >> 12)); | (((addr & ~((1 << I460_IO_PAGE_SHIFT) - 1)) & 0xffffff000) >> 12));
} }
int __init intel_i460_setup (struct pci_dev *pdev __attribute__((unused))) static int __init intel_i460_setup (struct pci_dev *pdev __attribute__((unused)))
{ {
agp_bridge.num_of_masks = 1; agp_bridge.num_of_masks = 1;
agp_bridge.masks = i460_masks; agp_bridge.masks = i460_masks;
...@@ -560,7 +560,7 @@ int __init intel_i460_setup (struct pci_dev *pdev __attribute__((unused))) ...@@ -560,7 +560,7 @@ int __init intel_i460_setup (struct pci_dev *pdev __attribute__((unused)))
return 0; return 0;
} }
static int agp_intel_i460_probe (struct pci_dev *dev, const struct pci_device_id *ent) static int __init agp_intel_i460_probe (struct pci_dev *dev, const struct pci_device_id *ent)
{ {
u8 cap_ptr = 0; u8 cap_ptr = 0;
...@@ -589,7 +589,7 @@ static struct pci_device_id agp_i460_pci_table[] __initdata = { ...@@ -589,7 +589,7 @@ static struct pci_device_id agp_i460_pci_table[] __initdata = {
MODULE_DEVICE_TABLE(pci, agp_i460_pci_table); MODULE_DEVICE_TABLE(pci, agp_i460_pci_table);
static struct pci_driver agp_i460_pci_driver = { static struct __initdata pci_driver agp_i460_pci_driver = {
.name = "agpgart-intel-i460", .name = "agpgart-intel-i460",
.id_table = agp_i460_pci_table, .id_table = agp_i460_pci_table,
.probe = agp_i460_probe, .probe = agp_i460_probe,
......
drivers/char/agp/i7x05-agp.c
View file @ 60d5a7ea
...@@ -166,7 +166,7 @@ static int __init agp_lookup_host_bridge (struct pci_dev *pdev) ...@@ -166,7 +166,7 @@ static int __init agp_lookup_host_bridge (struct pci_dev *pdev)
} }
static int agp_i7x05_probe (struct pci_dev *dev, const struct pci_device_id *ent) static int __init agp_i7x05_probe (struct pci_dev *dev, const struct pci_device_id *ent)
{ {
u8 cap_ptr = 0; u8 cap_ptr = 0;
...@@ -200,7 +200,7 @@ static struct pci_device_id agp_i7x05_pci_table[] __initdata = { ...@@ -200,7 +200,7 @@ static struct pci_device_id agp_i7x05_pci_table[] __initdata = {
MODULE_DEVICE_TABLE(pci, agp_i7x05_pci_table); MODULE_DEVICE_TABLE(pci, agp_i7x05_pci_table);
static struct pci_driver agp_i7x05_pci_driver = { static struct __initdata pci_driver agp_i7x05_pci_driver = {
.name = "agpgart-i7x05", .name = "agpgart-i7x05",
.id_table = agp_i7x05_pci_table, .id_table = agp_i7x05_pci_table,
.probe = agp_i7x05_probe, .probe = agp_i7x05_probe,
......
drivers/char/agp/intel-agp.c
View file @ 60d5a7ea
...@@ -246,7 +246,7 @@ static unsigned long intel_i810_mask_memory(unsigned long addr, int type) ...@@ -246,7 +246,7 @@ static unsigned long intel_i810_mask_memory(unsigned long addr, int type)
return addr | agp_bridge.masks[type].mask; return addr | agp_bridge.masks[type].mask;
} }
int __init intel_i810_setup(struct pci_dev *i810_dev) static int __init intel_i810_setup(struct pci_dev *i810_dev)
{ {
intel_i810_private.i810_dev = i810_dev; intel_i810_private.i810_dev = i810_dev;
...@@ -525,7 +525,7 @@ static agp_memory *intel_i830_alloc_by_type(size_t pg_count,int type) ...@@ -525,7 +525,7 @@ static agp_memory *intel_i830_alloc_by_type(size_t pg_count,int type)
return(NULL); return(NULL);
} }
int __init intel_i830_setup(struct pci_dev *i830_dev) static int __init intel_i830_setup(struct pci_dev *i830_dev)
{ {
intel_i830_private.i830_dev = i830_dev; intel_i830_private.i830_dev = i830_dev;
...@@ -1438,7 +1438,7 @@ static int __init agp_find_supported_device(struct pci_dev *dev) ...@@ -1438,7 +1438,7 @@ static int __init agp_find_supported_device(struct pci_dev *dev)
} }
static int agp_intel_probe (struct pci_dev *dev, const struct pci_device_id *ent) static int __init agp_intel_probe (struct pci_dev *dev, const struct pci_device_id *ent)
{ {
if (agp_find_supported_device(dev) == 0) { if (agp_find_supported_device(dev) == 0) {
agp_register_driver(dev); agp_register_driver(dev);
...@@ -1461,7 +1461,7 @@ static struct pci_device_id agp_intel_pci_table[] __initdata = { ...@@ -1461,7 +1461,7 @@ static struct pci_device_id agp_intel_pci_table[] __initdata = {
MODULE_DEVICE_TABLE(pci, agp_intel_pci_table); MODULE_DEVICE_TABLE(pci, agp_intel_pci_table);
static struct pci_driver agp_intel_pci_driver = { static struct __initdata pci_driver agp_intel_pci_driver = {
.name = "agpgart-intel", .name = "agpgart-intel",
.id_table = agp_intel_pci_table, .id_table = agp_intel_pci_table,
.probe = agp_intel_probe, .probe = agp_intel_probe,
......
drivers/char/agp/sis-agp.c
View file @ 60d5a7ea
...@@ -86,7 +86,7 @@ static struct gatt_mask sis_generic_masks[] = ...@@ -86,7 +86,7 @@ static struct gatt_mask sis_generic_masks[] =
{.mask = 0x00000000, .type = 0} {.mask = 0x00000000, .type = 0}
}; };
int __init sis_generic_setup (struct pci_dev *pdev) static int __init sis_generic_setup (struct pci_dev *pdev)
{ {
agp_bridge.masks = sis_generic_masks; agp_bridge.masks = sis_generic_masks;
agp_bridge.num_of_masks = 1; agp_bridge.num_of_masks = 1;
...@@ -223,7 +223,7 @@ static int __init agp_lookup_host_bridge (struct pci_dev *pdev) ...@@ -223,7 +223,7 @@ static int __init agp_lookup_host_bridge (struct pci_dev *pdev)
} }
static int agp_sis_probe (struct pci_dev *dev, const struct pci_device_id *ent) static int __init agp_sis_probe (struct pci_dev *dev, const struct pci_device_id *ent)
{ {
u8 cap_ptr = 0; u8 cap_ptr = 0;
...@@ -257,13 +257,13 @@ static struct pci_device_id agp_sis_pci_table[] __initdata = { ...@@ -257,13 +257,13 @@ static struct pci_device_id agp_sis_pci_table[] __initdata = {
MODULE_DEVICE_TABLE(pci, agp_sis_pci_table); MODULE_DEVICE_TABLE(pci, agp_sis_pci_table);
static struct pci_driver agp_sis_pci_driver = { static struct __initdata pci_driver agp_sis_pci_driver = {
.name = "agpgart-sis", .name = "agpgart-sis",
.id_table = agp_sis_pci_table, .id_table = agp_sis_pci_table,
.probe = agp_sis_probe, .probe = agp_sis_probe,
}; };
int __init agp_sis_init(void) static int __init agp_sis_init(void)
{ {
int ret_val; int ret_val;
......
drivers/char/agp/sworks-agp.c
View file @ 60d5a7ea
...@@ -512,7 +512,7 @@ static void serverworks_agp_enable(u32 mode) ...@@ -512,7 +512,7 @@ static void serverworks_agp_enable(u32 mode)
} }
} }
int __init serverworks_setup (struct pci_dev *pdev) static int __init serverworks_setup (struct pci_dev *pdev)
{ {
u32 temp; u32 temp;
u32 temp2; u32 temp2;
...@@ -617,7 +617,7 @@ static int __init agp_find_supported_device(struct pci_dev *dev) ...@@ -617,7 +617,7 @@ static int __init agp_find_supported_device(struct pci_dev *dev)
} }
static int agp_serverworks_probe (struct pci_dev *dev, const struct pci_device_id *ent) static int __init agp_serverworks_probe (struct pci_dev *dev, const struct pci_device_id *ent)
{ {
if (agp_find_supported_device(dev) == 0) { if (agp_find_supported_device(dev) == 0) {
agp_bridge.dev = dev; agp_bridge.dev = dev;
...@@ -641,7 +641,7 @@ static struct pci_device_id agp_serverworks_pci_table[] __initdata = { ...@@ -641,7 +641,7 @@ static struct pci_device_id agp_serverworks_pci_table[] __initdata = {
MODULE_DEVICE_TABLE(pci, agp_serverworks_pci_table); MODULE_DEVICE_TABLE(pci, agp_serverworks_pci_table);
static struct pci_driver agp_serverworks_pci_driver = { static struct __initdata pci_driver agp_serverworks_pci_driver = {
.name = "agpgart-serverworks", .name = "agpgart-serverworks",
.id_table = agp_serverworks_pci_table, .id_table = agp_serverworks_pci_table,
.probe = agp_serverworks_probe, .probe = agp_serverworks_probe,
......
drivers/char/agp/via-agp.c
View file @ 60d5a7ea
...@@ -131,7 +131,7 @@ static int __init via_generic_setup (struct pci_dev *pdev) ...@@ -131,7 +131,7 @@ static int __init via_generic_setup (struct pci_dev *pdev)
* 2.0 compatability mode, we run the normal 3.0 code, and fall back * 2.0 compatability mode, we run the normal 3.0 code, and fall back
* if something nasty happens. * if something nasty happens.
*/ */
static void via_kt400_enable(u32 mode) static void __init via_kt400_enable(u32 mode)
{ {
if ((agp_generic_agp_3_0_enable(mode))==FALSE) if ((agp_generic_agp_3_0_enable(mode))==FALSE)
/* Something weird happened, fall back to 2.0 */ /* Something weird happened, fall back to 2.0 */
...@@ -278,7 +278,7 @@ static int __init agp_lookup_host_bridge (struct pci_dev *pdev) ...@@ -278,7 +278,7 @@ static int __init agp_lookup_host_bridge (struct pci_dev *pdev)
} }
static int agp_via_probe (struct pci_dev *dev, const struct pci_device_id *ent) static int __init agp_via_probe (struct pci_dev *dev, const struct pci_device_id *ent)
{ {
u8 cap_ptr = 0; u8 cap_ptr = 0;
...@@ -312,7 +312,7 @@ static struct pci_device_id agp_via_pci_table[] __initdata = { ...@@ -312,7 +312,7 @@ static struct pci_device_id agp_via_pci_table[] __initdata = {
MODULE_DEVICE_TABLE(pci, agp_via_pci_table); MODULE_DEVICE_TABLE(pci, agp_via_pci_table);
static struct pci_driver agp_via_pci_driver = { static struct __initdata pci_driver agp_via_pci_driver = {
.name = "agpgart-via", .name = "agpgart-via",
.id_table = agp_via_pci_table, .id_table = agp_via_pci_table,
.probe = agp_via_probe, .probe = agp_via_probe,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7