lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[SCSI] megaraid_sas: Rename megaraid_sas.c to megaraid_sas_base.c

Browse Source 
This patch renames megaraid_sas.c to megaraid_sas_base.c to facilitate
other files in the compile.

Signed-off-by: Adam Radford <aradford@gmail.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
This commit is contained in:
adam radford
2010-12-14 19:17:17 -08:00
committed by James Bottomley
parent fd01a6632d
commit 0d49016bba
2 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/scsi/megaraid/Makefile
View File

@@ -1,3 +1,4 @@
obj-$(CONFIG_MEGARAID_MM) += megaraid_mm.o
obj-$(CONFIG_MEGARAID_MAILBOX) += megaraid_mbox.o
obj-$(CONFIG_MEGARAID_SAS) += megaraid_sas.o
megaraid_sas-objs := megaraid_sas_base.o

8
drivers/scsi/megaraid/megaraid_sas.c → drivers/scsi/megaraid/megaraid_sas_base.c
View File

@@ -2476,8 +2476,8 @@ megasas_transition_to_ready(struct megasas_instance* instance)
fw_state = instance->instancet->read_fw_status_reg(instance->reg_set) & MFI_STATE_MASK;
if (fw_state != MFI_STATE_READY)
printk(KERN_INFO "megasas: Waiting for FW to come to ready"
" state\n");
printk(KERN_INFO "megasas: Waiting for FW to come to ready"
" state\n");
while (fw_state != MFI_STATE_READY) {
@@ -2610,7 +2610,7 @@ megasas_transition_to_ready(struct megasas_instance* instance)
return -ENODEV;
}
}
printk(KERN_INFO "megasas: FW now in Ready state\n");
printk(KERN_INFO "megasas: FW now in Ready state\n");
return 0;
}
@@ -5165,7 +5165,7 @@ err_dcf_attr_ver:
pci_unregister_driver(&megasas_pci_driver);
err_pcidrv:
unregister_chrdev(megasas_mgmt_majorno, "megaraid_sas_ioctl");
return rval;
return rval;
}
/**