Char: cyclades, remove useless fileds from cyclades_card

[linux-2.6] / drivers / char / cyclades.c

diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c
index 249f443115f278ffd1fb04e374a4ea3f0b161621..a79a4b213bba722ba009aee3a9f63ec5dbde9088 100644 (file)
--- a/drivers/char/cyclades.c
+++ b/drivers/char/cyclades.c
@@ -4049,14 +4049,6 @@ cy_ioctl(struct tty_struct *tty, struct file *file,
        case CYGETRTSDTR_INV:
                ret_val = info->rtsdtr_inv;
                break;
-       case CYGETCARDINFO:
-               if (copy_to_user(argp, &cy_card[info->card],
-                                sizeof(struct cyclades_card))) {
-                       ret_val = -EFAULT;
-                       break;
-               }
-               ret_val = 0;
-               break;
        case CYGETCD1400VER:
                ret_val = info->chip_rev;
                break;
@@ -4922,15 +4914,12 @@ static int __devinit cy_init_Ze(unsigned long cy_pci_phys0,
 #endif                         /* CONFIG_CYZ_INTR */
 
        /* set cy_card */
-       cy_card[j].base_phys = cy_pci_phys2;
-       cy_card[j].ctl_phys = cy_pci_phys0;
        cy_card[j].base_addr = cy_pci_addr2;
        cy_card[j].ctl_addr = cy_pci_addr0;
        cy_card[j].irq = (int)cy_pci_irq;
        cy_card[j].bus_index = 1;
        cy_card[j].first_line = cy_next_channel;
        cy_card[j].num_chips = -1;
-       cy_card[j].pdev = pdev;
        cy_init_card(&cy_card[j], j);
        pci_set_drvdata(pdev, &cy_card[j]);
 
@@ -5074,15 +5063,12 @@ static int __devinit cy_pci_probe(struct pci_dev *pdev,
                }
 
                /* set cy_card */
-               cy_card[j].base_phys = (ulong) cy_pci_phys2;
-               cy_card[j].ctl_phys = (ulong) cy_pci_phys0;
                cy_card[j].base_addr = cy_pci_addr2;
                cy_card[j].ctl_addr = cy_pci_addr0;
                cy_card[j].irq = (int)cy_pci_irq;
                cy_card[j].bus_index = 1;
                cy_card[j].first_line = cy_next_channel;
                cy_card[j].num_chips = cy_pci_nchan / 4;
-               cy_card[j].pdev = pdev;
                cy_init_card(&cy_card[j], j);
                pci_set_drvdata(pdev, &cy_card[j]);
 
@@ -5261,15 +5247,12 @@ static int __devinit cy_pci_probe(struct pci_dev *pdev,
 #endif                         /* CONFIG_CYZ_INTR */
 
                /* set cy_card */
-               cy_card[j].base_phys = cy_pci_phys2;
-               cy_card[j].ctl_phys = cy_pci_phys0;
                cy_card[j].base_addr = cy_pci_addr2;
                cy_card[j].ctl_addr = cy_pci_addr0;
                cy_card[j].irq = (int)cy_pci_irq;
                cy_card[j].bus_index = 1;
                cy_card[j].first_line = cy_next_channel;
                cy_card[j].num_chips = -1;
-               cy_card[j].pdev = pdev;
                cy_init_card(&cy_card[j], j);
                pci_set_drvdata(pdev, &cy_card[j]);