diff options
author | Joe Perches <joe@perches.com> | 2014-08-08 17:24:46 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-08 18:57:29 -0400 |
commit | 7c845eb5e184977d9c7135ae20d012b59f8cc729 (patch) | |
tree | 71115a1f8b3528722917faf589171a4c690547ea /drivers/scsi/eata.c | |
parent | 8ac41b9dc719b4a5c65a2192988e8199278bb71a (diff) |
scsi: use pci_zalloc_consistent
Remove the now unnecessary memset too.
Signed-off-by: Joe Perches <joe@perches.com>
Cc: Adam Radford <linuxraid@lsi.com>
Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
Cc: Jayamohan Kallickal <jayamohan.kallickal@emulex.com>
Cc: Dario Ballabio <ballabio_dario@emc.com>
Cc: Michael Neuffer <mike@i-Connect.Net>
Cc: "Stephen M. Cameron" <scameron@beardog.cce.hp.com>
Cc: Neela Syam Kolli <megaraidlinux@lsi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/scsi/eata.c')
-rw-r--r-- | drivers/scsi/eata.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/scsi/eata.c b/drivers/scsi/eata.c index 03372cff38f3..813dd5c998e4 100644 --- a/drivers/scsi/eata.c +++ b/drivers/scsi/eata.c | |||
@@ -1238,8 +1238,8 @@ static int port_detect(unsigned long port_base, unsigned int j, | |||
1238 | struct eata_config *cf; | 1238 | struct eata_config *cf; |
1239 | dma_addr_t cf_dma_addr; | 1239 | dma_addr_t cf_dma_addr; |
1240 | 1240 | ||
1241 | cf = pci_alloc_consistent(pdev, sizeof(struct eata_config), | 1241 | cf = pci_zalloc_consistent(pdev, sizeof(struct eata_config), |
1242 | &cf_dma_addr); | 1242 | &cf_dma_addr); |
1243 | 1243 | ||
1244 | if (!cf) { | 1244 | if (!cf) { |
1245 | printk | 1245 | printk |
@@ -1249,7 +1249,6 @@ static int port_detect(unsigned long port_base, unsigned int j, | |||
1249 | } | 1249 | } |
1250 | 1250 | ||
1251 | /* Set board configuration */ | 1251 | /* Set board configuration */ |
1252 | memset((char *)cf, 0, sizeof(struct eata_config)); | ||
1253 | cf->len = (ushort) H2DEV16((ushort) 510); | 1252 | cf->len = (ushort) H2DEV16((ushort) 510); |
1254 | cf->ocena = 1; | 1253 | cf->ocena = 1; |
1255 | 1254 | ||