diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/media/pci/ttpci/av7110_ir.c | 2 | ||||
-rw-r--r-- | drivers/net/irda/vlsi_ir.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/airo.c | 34 | ||||
-rw-r--r-- | drivers/pci/proc.c | 2 | ||||
-rw-r--r-- | drivers/pnp/isapnp/proc.c | 2 | ||||
-rw-r--r-- | drivers/zorro/proc.c | 2 |
6 files changed, 16 insertions, 28 deletions
diff --git a/drivers/media/pci/ttpci/av7110_ir.c b/drivers/media/pci/ttpci/av7110_ir.c index eb822862a646..0e763a784e2b 100644 --- a/drivers/media/pci/ttpci/av7110_ir.c +++ b/drivers/media/pci/ttpci/av7110_ir.c | |||
@@ -375,7 +375,7 @@ int av7110_ir_init(struct av7110 *av7110) | |||
375 | if (av_cnt == 1) { | 375 | if (av_cnt == 1) { |
376 | e = proc_create("av7110_ir", S_IWUSR, NULL, &av7110_ir_proc_fops); | 376 | e = proc_create("av7110_ir", S_IWUSR, NULL, &av7110_ir_proc_fops); |
377 | if (e) | 377 | if (e) |
378 | e->size = 4 + 256 * sizeof(u16); | 378 | proc_set_size(e, 4 + 256 * sizeof(u16)); |
379 | } | 379 | } |
380 | 380 | ||
381 | tasklet_init(&av7110->ir.ir_tasklet, av7110_emit_key, (unsigned long) &av7110->ir); | 381 | tasklet_init(&av7110->ir.ir_tasklet, av7110_emit_key, (unsigned long) &av7110->ir); |
diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c index e22cd4e7017a..5f4758492e4c 100644 --- a/drivers/net/irda/vlsi_ir.c +++ b/drivers/net/irda/vlsi_ir.c | |||
@@ -1678,7 +1678,7 @@ vlsi_irda_probe(struct pci_dev *pdev, const struct pci_device_id *id) | |||
1678 | IRDA_WARNING("%s: failed to create proc entry\n", | 1678 | IRDA_WARNING("%s: failed to create proc entry\n", |
1679 | __func__); | 1679 | __func__); |
1680 | } else { | 1680 | } else { |
1681 | ent->size = 0; | 1681 | proc_set_size(ent, 0); |
1682 | } | 1682 | } |
1683 | idev->proc_entry = ent; | 1683 | idev->proc_entry = ent; |
1684 | } | 1684 | } |
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c index 66e398d4730d..21d02335b46f 100644 --- a/drivers/net/wireless/airo.c +++ b/drivers/net/wireless/airo.c | |||
@@ -4507,73 +4507,63 @@ static int setup_proc_entry( struct net_device *dev, | |||
4507 | airo_entry); | 4507 | airo_entry); |
4508 | if (!apriv->proc_entry) | 4508 | if (!apriv->proc_entry) |
4509 | goto fail; | 4509 | goto fail; |
4510 | apriv->proc_entry->uid = proc_kuid; | 4510 | proc_set_user(apriv->proc_entry, proc_kuid, proc_kgid); |
4511 | apriv->proc_entry->gid = proc_kgid; | ||
4512 | 4511 | ||
4513 | /* Setup the StatsDelta */ | 4512 | /* Setup the StatsDelta */ |
4514 | entry = proc_create_data("StatsDelta", S_IRUGO & proc_perm, | 4513 | entry = proc_create_data("StatsDelta", S_IRUGO & proc_perm, |
4515 | apriv->proc_entry, &proc_statsdelta_ops, dev); | 4514 | apriv->proc_entry, &proc_statsdelta_ops, dev); |
4516 | if (!entry) | 4515 | if (!entry) |
4517 | goto fail_stats_delta; | 4516 | goto fail_stats_delta; |
4518 | entry->uid = proc_kuid; | 4517 | proc_set_user(entry, proc_kuid, proc_kgid); |
4519 | entry->gid = proc_kgid; | ||
4520 | 4518 | ||
4521 | /* Setup the Stats */ | 4519 | /* Setup the Stats */ |
4522 | entry = proc_create_data("Stats", S_IRUGO & proc_perm, | 4520 | entry = proc_create_data("Stats", S_IRUGO & proc_perm, |
4523 | apriv->proc_entry, &proc_stats_ops, dev); | 4521 | apriv->proc_entry, &proc_stats_ops, dev); |
4524 | if (!entry) | 4522 | if (!entry) |
4525 | goto fail_stats; | 4523 | goto fail_stats; |
4526 | entry->uid = proc_kuid; | 4524 | proc_set_user(entry, proc_kuid, proc_kgid); |
4527 | entry->gid = proc_kgid; | ||
4528 | 4525 | ||
4529 | /* Setup the Status */ | 4526 | /* Setup the Status */ |
4530 | entry = proc_create_data("Status", S_IRUGO & proc_perm, | 4527 | entry = proc_create_data("Status", S_IRUGO & proc_perm, |
4531 | apriv->proc_entry, &proc_status_ops, dev); | 4528 | apriv->proc_entry, &proc_status_ops, dev); |
4532 | if (!entry) | 4529 | if (!entry) |
4533 | goto fail_status; | 4530 | goto fail_status; |
4534 | entry->uid = proc_kuid; | 4531 | proc_set_user(entry, proc_kuid, proc_kgid); |
4535 | entry->gid = proc_kgid; | ||
4536 | 4532 | ||
4537 | /* Setup the Config */ | 4533 | /* Setup the Config */ |
4538 | entry = proc_create_data("Config", proc_perm, | 4534 | entry = proc_create_data("Config", proc_perm, |
4539 | apriv->proc_entry, &proc_config_ops, dev); | 4535 | apriv->proc_entry, &proc_config_ops, dev); |
4540 | if (!entry) | 4536 | if (!entry) |
4541 | goto fail_config; | 4537 | goto fail_config; |
4542 | entry->uid = proc_kuid; | 4538 | proc_set_user(entry, proc_kuid, proc_kgid); |
4543 | entry->gid = proc_kgid; | ||
4544 | 4539 | ||
4545 | /* Setup the SSID */ | 4540 | /* Setup the SSID */ |
4546 | entry = proc_create_data("SSID", proc_perm, | 4541 | entry = proc_create_data("SSID", proc_perm, |
4547 | apriv->proc_entry, &proc_SSID_ops, dev); | 4542 | apriv->proc_entry, &proc_SSID_ops, dev); |
4548 | if (!entry) | 4543 | if (!entry) |
4549 | goto fail_ssid; | 4544 | goto fail_ssid; |
4550 | entry->uid = proc_kuid; | 4545 | proc_set_user(entry, proc_kuid, proc_kgid); |
4551 | entry->gid = proc_kgid; | ||
4552 | 4546 | ||
4553 | /* Setup the APList */ | 4547 | /* Setup the APList */ |
4554 | entry = proc_create_data("APList", proc_perm, | 4548 | entry = proc_create_data("APList", proc_perm, |
4555 | apriv->proc_entry, &proc_APList_ops, dev); | 4549 | apriv->proc_entry, &proc_APList_ops, dev); |
4556 | if (!entry) | 4550 | if (!entry) |
4557 | goto fail_aplist; | 4551 | goto fail_aplist; |
4558 | entry->uid = proc_kuid; | 4552 | proc_set_user(entry, proc_kuid, proc_kgid); |
4559 | entry->gid = proc_kgid; | ||
4560 | 4553 | ||
4561 | /* Setup the BSSList */ | 4554 | /* Setup the BSSList */ |
4562 | entry = proc_create_data("BSSList", proc_perm, | 4555 | entry = proc_create_data("BSSList", proc_perm, |
4563 | apriv->proc_entry, &proc_BSSList_ops, dev); | 4556 | apriv->proc_entry, &proc_BSSList_ops, dev); |
4564 | if (!entry) | 4557 | if (!entry) |
4565 | goto fail_bsslist; | 4558 | goto fail_bsslist; |
4566 | entry->uid = proc_kuid; | 4559 | proc_set_user(entry, proc_kuid, proc_kgid); |
4567 | entry->gid = proc_kgid; | ||
4568 | 4560 | ||
4569 | /* Setup the WepKey */ | 4561 | /* Setup the WepKey */ |
4570 | entry = proc_create_data("WepKey", proc_perm, | 4562 | entry = proc_create_data("WepKey", proc_perm, |
4571 | apriv->proc_entry, &proc_wepkey_ops, dev); | 4563 | apriv->proc_entry, &proc_wepkey_ops, dev); |
4572 | if (!entry) | 4564 | if (!entry) |
4573 | goto fail_wepkey; | 4565 | goto fail_wepkey; |
4574 | entry->uid = proc_kuid; | 4566 | proc_set_user(entry, proc_kuid, proc_kgid); |
4575 | entry->gid = proc_kgid; | ||
4576 | |||
4577 | return 0; | 4567 | return 0; |
4578 | 4568 | ||
4579 | fail_wepkey: | 4569 | fail_wepkey: |
@@ -5695,10 +5685,8 @@ static int __init airo_init_module( void ) | |||
5695 | 5685 | ||
5696 | airo_entry = proc_mkdir_mode("driver/aironet", airo_perm, NULL); | 5686 | airo_entry = proc_mkdir_mode("driver/aironet", airo_perm, NULL); |
5697 | 5687 | ||
5698 | if (airo_entry) { | 5688 | if (airo_entry) |
5699 | airo_entry->uid = proc_kuid; | 5689 | proc_set_user(airo_entry, proc_kuid, proc_kgid); |
5700 | airo_entry->gid = proc_kgid; | ||
5701 | } | ||
5702 | 5690 | ||
5703 | for (i = 0; i < 4 && io[i] && irq[i]; i++) { | 5691 | for (i = 0; i < 4 && io[i] && irq[i]; i++) { |
5704 | airo_print_info("", "Trying to configure ISA adapter at irq=%d " | 5692 | airo_print_info("", "Trying to configure ISA adapter at irq=%d " |
diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c index 12e4fb5824c1..7cde7c131fd0 100644 --- a/drivers/pci/proc.c +++ b/drivers/pci/proc.c | |||
@@ -419,7 +419,7 @@ int pci_proc_attach_device(struct pci_dev *dev) | |||
419 | &proc_bus_pci_operations, dev); | 419 | &proc_bus_pci_operations, dev); |
420 | if (!e) | 420 | if (!e) |
421 | return -ENOMEM; | 421 | return -ENOMEM; |
422 | e->size = dev->cfg_size; | 422 | proc_set_size(e, dev->cfg_size); |
423 | dev->procent = e; | 423 | dev->procent = e; |
424 | 424 | ||
425 | return 0; | 425 | return 0; |
diff --git a/drivers/pnp/isapnp/proc.c b/drivers/pnp/isapnp/proc.c index af4d40affb79..2365ef37ae24 100644 --- a/drivers/pnp/isapnp/proc.c +++ b/drivers/pnp/isapnp/proc.c | |||
@@ -105,7 +105,7 @@ static int isapnp_proc_attach_device(struct pnp_dev *dev) | |||
105 | &isapnp_proc_bus_file_operations, dev); | 105 | &isapnp_proc_bus_file_operations, dev); |
106 | if (!e) | 106 | if (!e) |
107 | return -ENOMEM; | 107 | return -ENOMEM; |
108 | e->size = 256; | 108 | proc_set_size(e, 256); |
109 | return 0; | 109 | return 0; |
110 | } | 110 | } |
111 | 111 | ||
diff --git a/drivers/zorro/proc.c b/drivers/zorro/proc.c index 6d3a602c004b..1c15ee7456b6 100644 --- a/drivers/zorro/proc.c +++ b/drivers/zorro/proc.c | |||
@@ -139,7 +139,7 @@ static int __init zorro_proc_attach_device(unsigned int slot) | |||
139 | &zorro_autocon[slot]); | 139 | &zorro_autocon[slot]); |
140 | if (!entry) | 140 | if (!entry) |
141 | return -ENOMEM; | 141 | return -ENOMEM; |
142 | entry->size = sizeof(struct zorro_dev); | 142 | proc_set_size(entry, sizeof(struct zorro_dev)); |
143 | return 0; | 143 | return 0; |
144 | } | 144 | } |
145 | 145 | ||