[SCSI] minor bug fixes and cleanups
BusLogic: use kzalloc(), remove cast to/from void* aic7xxx_old: fix typo in cast NCR53c406a: ifdef out static built code fd_mcs: ifdef out static built code ncr53c8xx: ifdef out static built code Signed-off-by: Jeff Garzik <jeff@garzik.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
committed by
James Bottomley
parent
bf4713418b
commit
db3a8815fb
@ -2186,21 +2186,21 @@ static int __init BusLogic_init(void)
|
||||
|
||||
if (BusLogic_ProbeOptions.NoProbe)
|
||||
return -ENODEV;
|
||||
BusLogic_ProbeInfoList = (struct BusLogic_ProbeInfo *)
|
||||
kmalloc(BusLogic_MaxHostAdapters * sizeof(struct BusLogic_ProbeInfo), GFP_ATOMIC);
|
||||
BusLogic_ProbeInfoList =
|
||||
kzalloc(BusLogic_MaxHostAdapters * sizeof(struct BusLogic_ProbeInfo), GFP_KERNEL);
|
||||
if (BusLogic_ProbeInfoList == NULL) {
|
||||
BusLogic_Error("BusLogic: Unable to allocate Probe Info List\n", NULL);
|
||||
return -ENOMEM;
|
||||
}
|
||||
memset(BusLogic_ProbeInfoList, 0, BusLogic_MaxHostAdapters * sizeof(struct BusLogic_ProbeInfo));
|
||||
PrototypeHostAdapter = (struct BusLogic_HostAdapter *)
|
||||
kmalloc(sizeof(struct BusLogic_HostAdapter), GFP_ATOMIC);
|
||||
|
||||
PrototypeHostAdapter =
|
||||
kzalloc(sizeof(struct BusLogic_HostAdapter), GFP_KERNEL);
|
||||
if (PrototypeHostAdapter == NULL) {
|
||||
kfree(BusLogic_ProbeInfoList);
|
||||
BusLogic_Error("BusLogic: Unable to allocate Prototype " "Host Adapter\n", NULL);
|
||||
return -ENOMEM;
|
||||
}
|
||||
memset(PrototypeHostAdapter, 0, sizeof(struct BusLogic_HostAdapter));
|
||||
|
||||
#ifdef MODULE
|
||||
if (BusLogic != NULL)
|
||||
BusLogic_Setup(BusLogic);
|
||||
|
Reference in New Issue
Block a user