diff options
author | Deepak Saxena <dsaxena@plexity.net> | 2005-11-07 04:01:25 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 10:54:00 -0500 |
commit | f5e3c2faa20615e900ab26bd957f898400435924 (patch) | |
tree | d3dd4c93539f155e3fd4ef18ae9cfe482ed1b340 /drivers/ide/legacy/ide-cs.c | |
parent | 9c2153844d72ac92b6da0ee42f7f81fb0aa91f8a (diff) |
[PATCH] ide: kmalloc + memset -> kzalloc conversion
Signed-off-by: Deepak Saxena <dsaxena@plexity.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/ide/legacy/ide-cs.c')
-rw-r--r-- | drivers/ide/legacy/ide-cs.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/ide/legacy/ide-cs.c b/drivers/ide/legacy/ide-cs.c index a35a58bef1a..1dafffa7e51 100644 --- a/drivers/ide/legacy/ide-cs.c +++ b/drivers/ide/legacy/ide-cs.c | |||
@@ -116,9 +116,8 @@ static dev_link_t *ide_attach(void) | |||
116 | DEBUG(0, "ide_attach()\n"); | 116 | DEBUG(0, "ide_attach()\n"); |
117 | 117 | ||
118 | /* Create new ide device */ | 118 | /* Create new ide device */ |
119 | info = kmalloc(sizeof(*info), GFP_KERNEL); | 119 | info = kzalloc(sizeof(*info), GFP_KERNEL); |
120 | if (!info) return NULL; | 120 | if (!info) return NULL; |
121 | memset(info, 0, sizeof(*info)); | ||
122 | link = &info->link; link->priv = info; | 121 | link = &info->link; link->priv = info; |
123 | 122 | ||
124 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; | 123 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; |
@@ -221,9 +220,8 @@ static void ide_config(dev_link_t *link) | |||
221 | 220 | ||
222 | DEBUG(0, "ide_config(0x%p)\n", link); | 221 | DEBUG(0, "ide_config(0x%p)\n", link); |
223 | 222 | ||
224 | stk = kmalloc(sizeof(*stk), GFP_KERNEL); | 223 | stk = kzalloc(sizeof(*stk), GFP_KERNEL); |
225 | if (!stk) goto err_mem; | 224 | if (!stk) goto err_mem; |
226 | memset(stk, 0, sizeof(*stk)); | ||
227 | cfg = &stk->parse.cftable_entry; | 225 | cfg = &stk->parse.cftable_entry; |
228 | 226 | ||
229 | tuple.TupleData = (cisdata_t *)&stk->buf; | 227 | tuple.TupleData = (cisdata_t *)&stk->buf; |