Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 422278ef authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: remove needless zeroing of hwgroup fields from init_irq() 



Since kmalloc_node() is called with __GFP_ZERO flag there is no need to
explicitly zero hwgroup fields.

While at it:

* Use 'hwif' instead of 'hwif->drives[0].hwif' for kmalloc_node() call.

* Fix whitespace damage.

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent a6fbb1c8

drivers/ide/ide-probe.c

+5 −10
Original line number Diff line number Diff line
@@ -998,19 +998,14 @@ static int init_irq (ide_hwif_t *hwif) 
		hwgroup->hwif->next = hwif;

		spin_unlock_irq(&ide_lock);

	} else {

		hwgroup = kmalloc_node(sizeof(ide_hwgroup_t),

					GFP_KERNEL | __GFP_ZERO,

					hwif_to_node(hwif->drives[0].hwif));

		if (!hwgroup)

		hwgroup = kmalloc_node(sizeof(*hwgroup), GFP_KERNEL|__GFP_ZERO,

				       hwif_to_node(hwif));

		if (hwgroup == NULL)

			goto out_up;



		hwif->hwgroup = hwgroup;



		hwgroup->hwif = hwif->next = hwif;

		hwgroup->rq       = NULL;

		hwgroup->handler  = NULL;

		hwgroup->drive    = NULL;

		hwgroup->busy     = 0;



		init_timer(&hwgroup->timer);

		hwgroup->timer.function = &ide_timer_expiry;

		hwgroup->timer.data = (unsigned long) hwgroup;