[SCSI] DAC960: kmalloc->kzalloc/Casting cleanups (0a361e31) · Commits · 戴 / test

drivers/block/DAC960.c

+13 −14

Original line number	Diff line number	Diff line
		@@ -1373,8 +1373,7 @@ static boolean DAC960_V2_EnableMemoryMailboxInterface(DAC960_Controller_T
		Controller->BounceBufferLimit = DAC690_V2_PciDmaMask;

		/* This is a temporary dma mapping, used only in the scope of this function */
		CommandMailbox =
		(DAC960_V2_CommandMailbox_T *)pci_alloc_consistent( PCI_Device,
		CommandMailbox = pci_alloc_consistent(PCI_Device,
		sizeof(DAC960_V2_CommandMailbox_T), &CommandMailboxDMA);
		if (CommandMailbox == NULL)
		return false;
		@@ -1879,8 +1878,8 @@ static boolean DAC960_V2_ReadControllerConfiguration(DAC960_Controller_T
		if (NewLogicalDeviceInfo->LogicalDeviceState !=
		DAC960_V2_LogicalDevice_Offline)
		Controller->LogicalDriveInitiallyAccessible[LogicalDeviceNumber] = true;
		LogicalDeviceInfo = (DAC960_V2_LogicalDeviceInfo_T *)
		kmalloc(sizeof(DAC960_V2_LogicalDeviceInfo_T), GFP_ATOMIC);
		LogicalDeviceInfo = kmalloc(sizeof(DAC960_V2_LogicalDeviceInfo_T),
		GFP_ATOMIC);
		if (LogicalDeviceInfo == NULL)
		return DAC960_Failure(Controller, "LOGICAL DEVICE ALLOCATION");
		Controller->V2.LogicalDeviceInformation[LogicalDeviceNumber] =
		@@ -2113,8 +2112,8 @@ static boolean DAC960_V2_ReadDeviceConfiguration(DAC960_Controller_T
		if (!DAC960_V2_NewPhysicalDeviceInfo(Controller, Channel, TargetID, LogicalUnit))
		break;

		PhysicalDeviceInfo = (DAC960_V2_PhysicalDeviceInfo_T *)
		kmalloc(sizeof(DAC960_V2_PhysicalDeviceInfo_T), GFP_ATOMIC);
		PhysicalDeviceInfo = kmalloc(sizeof(DAC960_V2_PhysicalDeviceInfo_T),
		GFP_ATOMIC);
		if (PhysicalDeviceInfo == NULL)
		return DAC960_Failure(Controller, "PHYSICAL DEVICE ALLOCATION");
		Controller->V2.PhysicalDeviceInformation[PhysicalDeviceIndex] =
		@@ -2122,8 +2121,8 @@ static boolean DAC960_V2_ReadDeviceConfiguration(DAC960_Controller_T
		memcpy(PhysicalDeviceInfo, NewPhysicalDeviceInfo,
		sizeof(DAC960_V2_PhysicalDeviceInfo_T));

		InquiryUnitSerialNumber = (DAC960_SCSI_Inquiry_UnitSerialNumber_T *)
		kmalloc(sizeof(DAC960_SCSI_Inquiry_UnitSerialNumber_T), GFP_ATOMIC);
		InquiryUnitSerialNumber = kmalloc(
		sizeof(DAC960_SCSI_Inquiry_UnitSerialNumber_T), GFP_ATOMIC);
		if (InquiryUnitSerialNumber == NULL) {
		kfree(PhysicalDeviceInfo);
		return DAC960_Failure(Controller, "SERIAL NUMBER ALLOCATION");
		@@ -4949,8 +4948,8 @@ static void DAC960_V2_ProcessCompletedCommand(DAC960_Command_T *Command)
		PhysicalDevice.LogicalUnit = NewLogicalDeviceInfo->LogicalUnit;
		Controller->V2.LogicalDriveToVirtualDevice[LogicalDeviceNumber] =
		PhysicalDevice;
		LogicalDeviceInfo = (DAC960_V2_LogicalDeviceInfo_T *)
		kmalloc(sizeof(DAC960_V2_LogicalDeviceInfo_T), GFP_ATOMIC);
		LogicalDeviceInfo = kmalloc(sizeof(DAC960_V2_LogicalDeviceInfo_T),
		GFP_ATOMIC);
		Controller->V2.LogicalDeviceInformation[LogicalDeviceNumber] =
		LogicalDeviceInfo;
		DAC960_Critical("Logical Drive %d (/dev/rd/c%dd%d) "
		@@ -5709,14 +5708,14 @@ static boolean DAC960_CheckStatusBuffer(DAC960_Controller_T *Controller,
		unsigned int NewStatusBufferLength = DAC960_InitialStatusBufferSize;
		while (NewStatusBufferLength < ByteCount)
		NewStatusBufferLength *= 2;
		Controller->CombinedStatusBuffer =
		(unsigned char *) kmalloc(NewStatusBufferLength, GFP_ATOMIC);
		Controller->CombinedStatusBuffer = kmalloc(NewStatusBufferLength,
		GFP_ATOMIC);
		if (Controller->CombinedStatusBuffer == NULL) return false;
		Controller->CombinedStatusBufferLength = NewStatusBufferLength;
		return true;
		}
		NewStatusBuffer = (unsigned char *)
		kmalloc(2 * Controller->CombinedStatusBufferLength, GFP_ATOMIC);
		NewStatusBuffer = kmalloc(2 * Controller->CombinedStatusBufferLength,
		GFP_ATOMIC);
		if (NewStatusBuffer == NULL)
		{
		DAC960_Warning("Unable to expand Combined Status Buffer - Truncating\n",

Admin message