renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-17 09:43:59 +08:00
Code

[SCSI] megaraid_legacy: removed PCI ID overlap from the driv er

Browse Source 
This patch fixes
	- PCI ID overlap issue
	- node name changed to 'megaraid_legacy'
I hope this patch addresses concerns brought by Daniel Drake.

Signed-off by: Seokmann Ju <seokmann.ju@enginio.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
Ju, Seokmann 2005-11-17 13:13:31 -05:00 committed by James Bottomley
parent be0d9b6c7a
commit 3492b32883
1 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/scsi/megaraid.c
View File

@ -2,7 +2,7 @@
* *
* Linux MegaRAID device driver * Linux MegaRAID device driver
* *
* Copyright © 2002 LSI Logic Corporation. * Copyright (c) 2002 LSI Logic Corporation.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -17,7 +17,8 @@
* Copyright (c) 2003 Christoph Hellwig <hch@lst.de> * Copyright (c) 2003 Christoph Hellwig <hch@lst.de>
* - new-style, hotplug-aware pci probing and scsi registration * - new-style, hotplug-aware pci probing and scsi registration
* *
* Version : v2.00.3 (Feb 19, 2003) - Atul Mukker <Atul.Mukker@lsil.com> * Version : v2.00.4 Mon Nov 14 14:02:43 EST 2005 - Seokmann Ju
* <Seokmann.Ju@lsil.com>
* *
* Description: Linux device driver for LSI Logic MegaRAID controller * Description: Linux device driver for LSI Logic MegaRAID controller
* *
@ -51,10 +52,10 @@
#include "megaraid.h" #include "megaraid.h"
#define MEGARAID_MODULE_VERSION "2.00.3" #define MEGARAID_MODULE_VERSION "2.00.4"
MODULE_AUTHOR ("LSI Logic Corporation"); MODULE_AUTHOR ("sju@lsil.com");
MODULE_DESCRIPTION ("LSI Logic MegaRAID driver"); MODULE_DESCRIPTION ("LSI Logic MegaRAID legacy driver");
MODULE_LICENSE ("GPL"); MODULE_LICENSE ("GPL");
MODULE_VERSION(MEGARAID_MODULE_VERSION); MODULE_VERSION(MEGARAID_MODULE_VERSION);
@ -4553,7 +4554,7 @@ mega_internal_done(Scsi_Cmnd *scmd)
static struct scsi_host_template megaraid_template = { static struct scsi_host_template megaraid_template = {
.module = THIS_MODULE, .module = THIS_MODULE,
.name = "MegaRAID", .name = "MegaRAID",
.proc_name = "megaraid", .proc_name = "megaraid_legacy",
.info = megaraid_info, .info = megaraid_info,
.queuecommand = megaraid_queue, .queuecommand = megaraid_queue,
.bios_param = megaraid_biosparam, .bios_param = megaraid_biosparam,
@ -5037,22 +5038,12 @@ megaraid_shutdown(struct pci_dev *pdev)
} }
static struct pci_device_id megaraid_pci_tbl[] = { static struct pci_device_id megaraid_pci_tbl[] = {
{PCI_VENDOR_ID_DELL, PCI_DEVICE_ID_DISCOVERY,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{PCI_VENDOR_ID_DELL, PCI_DEVICE_ID_PERC4_DI,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, BOARD_64BIT},
{PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_PERC4_QC_VERDE,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, BOARD_64BIT},
{PCI_VENDOR_ID_AMI, PCI_DEVICE_ID_AMI_MEGARAID, {PCI_VENDOR_ID_AMI, PCI_DEVICE_ID_AMI_MEGARAID,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{PCI_VENDOR_ID_AMI, PCI_DEVICE_ID_AMI_MEGARAID2, {PCI_VENDOR_ID_AMI, PCI_DEVICE_ID_AMI_MEGARAID2,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{PCI_VENDOR_ID_AMI, PCI_DEVICE_ID_AMI_MEGARAID3,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_AMI_MEGARAID3, {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_AMI_MEGARAID3,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_AMI_MEGARAID3,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{0,} {0,}
}; };
MODULE_DEVICE_TABLE(pci, megaraid_pci_tbl); MODULE_DEVICE_TABLE(pci, megaraid_pci_tbl);
@ -5095,7 +5086,7 @@ static int __init megaraid_init(void)
* First argument (major) to register_chrdev implies a dynamic * First argument (major) to register_chrdev implies a dynamic
* major number allocation. * major number allocation.
*/ */
major = register_chrdev(0, "megadev", &megadev_fops); major = register_chrdev(0, "megadev_legacy", &megadev_fops);
if (!major) { if (!major) {
printk(KERN_WARNING printk(KERN_WARNING
"megaraid: failed to register char device\n"); "megaraid: failed to register char device\n");
@ -5109,7 +5100,7 @@ static void __exit megaraid_exit(void)
/* /*
* Unregister the character device interface to the driver. * Unregister the character device interface to the driver.
*/ */
unregister_chrdev(major, "megadev"); unregister_chrdev(major, "megadev_legacy");
pci_unregister_driver(&megaraid_pci_driver); pci_unregister_driver(&megaraid_pci_driver);