From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Thu, 18 Oct 2007 22:30:09 +0000 (+0200)
Subject: scc_pata: remove ->init_setup
X-Git-Tag: v2.6.24-rc1~287^2~15
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=aaf707f061d5d87c9f671caa2904cd41c1c1a99e;p=linux-2.6-omap-h63xx.git

scc_pata: remove ->init_setup

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---

diff --git a/drivers/ide/pci/scc_pata.c b/drivers/ide/pci/scc_pata.c
index 2b1d5bd0009..8ae8f31c41d 100644
--- a/drivers/ide/pci/scc_pata.c
+++ b/drivers/ide/pci/scc_pata.c
@@ -698,7 +698,6 @@ static void __devinit init_hwif_scc(ide_hwif_t *hwif)
 #define DECLARE_SCC_DEV(name_str)			\
   {							\
       .name		= name_str,			\
-      .init_setup	= init_setup_scc,		\
       .init_iops	= init_iops_scc,		\
       .init_hwif	= init_hwif_scc,		\
       .host_flags	= IDE_HFLAG_SINGLE |		\
@@ -722,7 +721,8 @@ static ide_pci_device_t scc_chipsets[] __devinitdata = {
 static int __devinit scc_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
 	ide_pci_device_t *d = &scc_chipsets[id->driver_data];
-	return d->init_setup(dev, d);
+
+	return init_setup_scc(dev, d);
 }
 
 /**