diff options
Diffstat (limited to 'drivers/ata/pata_cmd64x.c')
| -rw-r--r-- | drivers/ata/pata_cmd64x.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/drivers/ata/pata_cmd64x.c b/drivers/ata/pata_cmd64x.c index 1c17cd1e8b2d..7ba01415b676 100644 --- a/drivers/ata/pata_cmd64x.c +++ b/drivers/ata/pata_cmd64x.c | |||
| @@ -423,7 +423,7 @@ static int cmd64x_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
| 423 | .port_ops = &cmd648_port_ops | 423 | .port_ops = &cmd648_port_ops |
| 424 | } | 424 | } |
| 425 | }; | 425 | }; |
| 426 | const struct ata_port_info *ppi[] = { | 426 | const struct ata_port_info *ppi[] = { |
| 427 | &cmd_info[id->driver_data], | 427 | &cmd_info[id->driver_data], |
| 428 | &cmd_info[id->driver_data], | 428 | &cmd_info[id->driver_data], |
| 429 | NULL | 429 | NULL |
| @@ -478,7 +478,7 @@ static int cmd64x_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
| 478 | if (port_ok && cntrl_ch0_ok && !(reg & CNTRL_CH0)) { | 478 | if (port_ok && cntrl_ch0_ok && !(reg & CNTRL_CH0)) { |
| 479 | dev_printk(KERN_NOTICE, &pdev->dev, "Primary port is disabled\n"); | 479 | dev_printk(KERN_NOTICE, &pdev->dev, "Primary port is disabled\n"); |
| 480 | ppi[0] = &ata_dummy_port_info; | 480 | ppi[0] = &ata_dummy_port_info; |
| 481 | 481 | ||
| 482 | } | 482 | } |
| 483 | if (port_ok && !(reg & CNTRL_CH1)) { | 483 | if (port_ok && !(reg & CNTRL_CH1)) { |
| 484 | dev_printk(KERN_NOTICE, &pdev->dev, "Secondary port is disabled\n"); | 484 | dev_printk(KERN_NOTICE, &pdev->dev, "Secondary port is disabled\n"); |
| @@ -525,21 +525,10 @@ static struct pci_driver cmd64x_pci_driver = { | |||
| 525 | #endif | 525 | #endif |
| 526 | }; | 526 | }; |
| 527 | 527 | ||
| 528 | static int __init cmd64x_init(void) | 528 | module_pci_driver(cmd64x_pci_driver); |
| 529 | { | ||
| 530 | return pci_register_driver(&cmd64x_pci_driver); | ||
| 531 | } | ||
| 532 | |||
| 533 | static void __exit cmd64x_exit(void) | ||
| 534 | { | ||
| 535 | pci_unregister_driver(&cmd64x_pci_driver); | ||
| 536 | } | ||
| 537 | 529 | ||
| 538 | MODULE_AUTHOR("Alan Cox"); | 530 | MODULE_AUTHOR("Alan Cox"); |
| 539 | MODULE_DESCRIPTION("low-level driver for CMD64x series PATA controllers"); | 531 | MODULE_DESCRIPTION("low-level driver for CMD64x series PATA controllers"); |
| 540 | MODULE_LICENSE("GPL"); | 532 | MODULE_LICENSE("GPL"); |
| 541 | MODULE_DEVICE_TABLE(pci, cmd64x); | 533 | MODULE_DEVICE_TABLE(pci, cmd64x); |
| 542 | MODULE_VERSION(DRV_VERSION); | 534 | MODULE_VERSION(DRV_VERSION); |
| 543 | |||
| 544 | module_init(cmd64x_init); | ||
| 545 | module_exit(cmd64x_exit); | ||
