From: Tejun Heo <tj@home-tj.org>
To: B.Zolnierkiewicz@elka.pw.edu.pl, linux-kernel@vger.kernel.org,
linux-ide@vger.kernel.org
Subject: Re: [PATCH 2.6.11-rc2 04/29] ide: cleanup piix
Date: Wed, 2 Feb 2005 11:46:11 +0900 [thread overview]
Message-ID: <20050202024611.GE621@htj.dyndns.org> (raw)
In-Reply-To: <20050202024017.GA621@htj.dyndns.org>
> 04_ide_cleanup_piix.patch
>
> In drivers/ide/pci/piix.[hc], init_setup_piix() is defined and
> used but only one init_setup function is defined and no
> demultiplexing is done using init_setup callback. As other
> drivers call ide_setup_pci_device() directly in such cases,
> this patch removes init_setup_piix() and makes piix_init_one()
> call ide_setup_pci_device() directly.
Signed-off-by: Tejun Heo <tj@home-tj.org>
Index: linux-ide-export/drivers/ide/pci/piix.c
===================================================================
--- linux-ide-export.orig/drivers/ide/pci/piix.c 2005-02-02 10:27:16.255142809 +0900
+++ linux-ide-export/drivers/ide/pci/piix.c 2005-02-02 10:28:02.317669535 +0900
@@ -531,20 +531,6 @@ static void __devinit init_hwif_piix(ide
}
/**
- * init_setup_piix - callback for IDE initialize
- * @dev: PIIX PCI device
- * @d: IDE pci info
- *
- * Enable the xp fixup for the PIIX controller and then perform
- * a standard ide PCI setup
- */
-
-static int __devinit init_setup_piix(struct pci_dev *dev, ide_pci_device_t *d)
-{
- return ide_setup_pci_device(dev, d);
-}
-
-/**
* piix_init_one - called when a PIIX is found
* @dev: the piix device
* @id: the matching pci id
@@ -557,7 +543,7 @@ static int __devinit piix_init_one(struc
{
ide_pci_device_t *d = &piix_pci_info[id->driver_data];
- return d->init_setup(dev, d);
+ return ide_setup_pci_device(dev, d);
}
/**
Index: linux-ide-export/drivers/ide/pci/piix.h
===================================================================
--- linux-ide-export.orig/drivers/ide/pci/piix.h 2005-02-02 10:27:16.255142809 +0900
+++ linux-ide-export/drivers/ide/pci/piix.h 2005-02-02 10:28:02.317669535 +0900
@@ -5,14 +5,12 @@
#include <linux/pci.h>
#include <linux/ide.h>
-static int init_setup_piix(struct pci_dev *, ide_pci_device_t *);
static unsigned int __devinit init_chipset_piix(struct pci_dev *, const char *);
static void init_hwif_piix(ide_hwif_t *);
#define DECLARE_PIIX_DEV(name_str) \
{ \
.name = name_str, \
- .init_setup = init_setup_piix, \
.init_chipset = init_chipset_piix, \
.init_hwif = init_hwif_piix, \
.channels = 2, \
@@ -32,7 +30,6 @@ static ide_pci_device_t piix_pci_info[]
{ /* 2 */
.name = "MPIIX",
- .init_setup = init_setup_piix,
.init_hwif = init_hwif_piix,
.channels = 2,
.autodma = NODMA,
next prev parent reply other threads:[~2005-02-02 2:48 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-02-02 2:40 [PATCH 2.6.11-rc2 0/29] ide: driver updates Tejun Heo
2005-02-02 2:43 ` [PATCH 2.6.11-rc2 01/29] ide: remove adma100 Tejun Heo
2005-02-02 23:43 ` Bartlomiej Zolnierkiewicz
2005-02-02 2:44 ` [PATCH 2.6.11-rc2 02/29] ide: cleanup it8172 Tejun Heo
2005-02-03 0:00 ` Bartlomiej Zolnierkiewicz
2005-02-02 2:45 ` [PATCH 2.6.11-rc2 03/29] ide: cleanup opti621 Tejun Heo
2005-02-03 0:05 ` Bartlomiej Zolnierkiewicz
2005-02-02 2:46 ` Tejun Heo [this message]
2005-02-03 0:20 ` [PATCH 2.6.11-rc2 04/29] ide: cleanup piix Bartlomiej Zolnierkiewicz
2005-02-02 2:47 ` [PATCH 2.6.11-rc2 05/29] ide: merge pci driver .h's into .c's Tejun Heo
2005-02-04 2:00 ` Bartlomiej Zolnierkiewicz
2005-02-02 2:48 ` [PATCH 2.6.11-rc2 06/29] ide: IDE_CONTROL_REG cleanup Tejun Heo
2005-02-03 0:23 ` Bartlomiej Zolnierkiewicz
2005-02-02 2:49 ` [PATCH 2.6.11-rc2 07/29] ide: ide_reg_valid_t endian fix Tejun Heo
2005-02-02 2:50 ` [PATCH 2.6.11-rc2 8/29] ide: driver updates Tejun Heo
2005-02-02 3:14 ` [PATCH 2.6.11-rc2 08/29] ide: do_identify() string termination fix Tejun Heo
2005-02-02 2:51 ` [PATCH 2.6.11-rc2 09/29] ide: __ide_do_rw_disk() lba48 dma check fix Tejun Heo
2005-02-03 0:33 ` Bartlomiej Zolnierkiewicz
2005-02-02 2:52 ` [PATCH 2.6.11-rc2 10/29] ide: __ide_do_rw_disk() return value fix Tejun Heo
2005-02-03 0:36 ` Bartlomiej Zolnierkiewicz
2005-02-02 2:54 ` [PATCH 2.6.11-rc2 11/29] ide: add ide_drive_t.sleeping Tejun Heo
2005-02-03 0:47 ` Bartlomiej Zolnierkiewicz
2005-02-03 11:37 ` Jens Axboe
2005-02-03 13:30 ` Bartlomiej Zolnierkiewicz
2005-02-03 13:32 ` Jens Axboe
2005-02-03 13:35 ` Bartlomiej Zolnierkiewicz
2005-02-03 22:20 ` Tejun Heo
2005-02-04 8:39 ` Jens Axboe
2005-02-03 14:13 ` Bartlomiej Zolnierkiewicz
2005-02-02 2:55 ` [PATCH 2.6.11-rc2 12/29] ide: add ide_hwgroup_t.polling Tejun Heo
2005-02-03 0:42 ` Bartlomiej Zolnierkiewicz
2005-02-03 14:20 ` Bartlomiej Zolnierkiewicz
2005-02-02 2:56 ` [PATCH 2.6.11-rc2 13/29] ide: use time_after() macro Tejun Heo
2005-02-03 1:07 ` Bartlomiej Zolnierkiewicz
2005-02-02 2:57 ` [PATCH 2.6.11-rc2 14/29] ide: remove NULL checking in ide_error() Tejun Heo
2005-02-03 1:14 ` Bartlomiej Zolnierkiewicz
2005-02-02 2:58 ` [PATCH 2.6.11-rc2 15/29] ide: flagged_taskfile() data byte order fix Tejun Heo
2005-02-02 3:00 ` [PATCH 2.6.11-rc2 16/29] ide: flagged_taskfile select register dev bit masking Tejun Heo
2005-02-02 3:01 ` [PATCH 2.6.11-rc2 17/29] ide: flagged_taskfile() tf_out_flags.b.select check Tejun Heo
2005-02-02 3:02 ` [PATCH 2.6.11-rc2 18/29] ide: comment fixes Tejun Heo
2005-02-03 1:17 ` Bartlomiej Zolnierkiewicz
2005-02-02 3:03 ` [PATCH 2.6.11-rc2 19/29] ide: ide_diag_taskfile() rq initialization fix Tejun Heo
2005-02-02 3:05 ` [PATCH 2.6.11-rc2 20/29] ide: task_end_request() fix Tejun Heo
2005-02-02 3:06 ` [PATCH 2.6.11-rc2 21/29] ide: Merge do_rw_taskfile() and flagged_taskfile() Tejun Heo
2005-02-03 18:39 ` Bartlomiej Zolnierkiewicz
2005-02-04 0:30 ` Tejun Heo
2005-02-02 3:07 ` [PATCH 2.6.11-rc2 22/29] ide: convert REQ_DRIVE_TASK to REQ_DRIVE_TASKFILE Tejun Heo
2005-02-03 17:30 ` Bartlomiej Zolnierkiewicz
2005-02-04 0:54 ` Tejun Heo
2005-02-04 1:50 ` Bartlomiej Zolnierkiewicz
2005-02-02 3:08 ` [PATCH 2.6.11-rc2 23/29] ide: map ide_task_ioctl() to ide_taskfile_ioctl() Tejun Heo
2005-02-03 17:37 ` Bartlomiej Zolnierkiewicz
2005-02-03 17:38 ` Bartlomiej Zolnierkiewicz
2005-02-02 3:08 ` [PATCH 2.6.11-rc2 24/29] ide: remove REQ_DRIVE_TASK handling Tejun Heo
2005-02-02 3:10 ` [PATCH 2.6.11-rc2 26/29] ide: map ide_cmd_ioctl() to ide_taskfile_ioctl() Tejun Heo
2005-02-03 17:54 ` Bartlomiej Zolnierkiewicz
2005-02-04 2:11 ` Tejun Heo
2005-02-04 2:22 ` Bartlomiej Zolnierkiewicz
2005-02-02 3:11 ` [PATCH 2.6.11-rc2 27/29] ide: remove REQ_DRIVE_CMD handling Tejun Heo
2005-02-02 3:11 ` [PATCH 2.6.11-rc2 28/29] ide: ide_init_drive_cmd() now defaults to REQ_DRIVE_TASKFILE Tejun Heo
2005-02-02 3:12 ` [PATCH 2.6.11-rc2 29/29] ide: make data_phase explicit in NO_DATA cases Tejun Heo
2005-02-03 17:43 ` Bartlomiej Zolnierkiewicz
2005-02-04 0:59 ` Tejun Heo
2005-02-04 1:37 ` Bartlomiej Zolnierkiewicz
2005-02-02 3:15 ` [PATCH 2.6.11-rc2 25/29] ide: convert REQ_DRIVE_CMD to REQ_DRIVE_TASKFILE Tejun Heo
2005-02-03 17:46 ` Bartlomiej Zolnierkiewicz
2005-02-04 1:06 ` Tejun Heo
2005-02-04 1:40 ` Bartlomiej Zolnierkiewicz
2005-02-02 8:31 ` [PATCH 2.6.11-rc2 0/29] ide: driver updates Jeff Garzik
2005-02-03 10:03 ` Alan Cox
2005-02-03 1:03 ` Bartlomiej Zolnierkiewicz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20050202024611.GE621@htj.dyndns.org \
--to=tj@home-tj.org \
--cc=B.Zolnierkiewicz@elka.pw.edu.pl \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®