From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
To: linux-ide@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH] ide: remove ->hold field from ide_hwif_t (take 2)
Date: Sat, 9 Feb 2008 18:54:07 +0100 [thread overview]
Message-ID: <200802091854.07310.bzolnier@gmail.com> (raw)
->hold is write-only now, remove it.
v2:
* v1 missed bast-ide, palm_bk3710, ide-cs and delkin_cb host drivers.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---
drivers/ide/arm/bast-ide.c | 2 +-
drivers/ide/arm/palm_bk3710.c | 2 +-
drivers/ide/legacy/ide-cs.c | 2 +-
drivers/ide/mips/au1xxx-ide.c | 3 ---
drivers/ide/pci/delkin_cb.c | 2 +-
drivers/ide/ppc/pmac.c | 1 -
include/linux/ide.h | 1 -
7 files changed, 4 insertions(+), 9 deletions(-)
Index: b/drivers/ide/arm/bast-ide.c
===================================================================
--- a/drivers/ide/arm/bast-ide.c
+++ b/drivers/ide/arm/bast-ide.c
@@ -54,7 +54,7 @@ bastide_register(unsigned int base, unsi
if (hwif->present)
ide_unregister(i);
- else if (!hwif->hold)
+ else
ide_init_port_data(hwif, i);
ide_init_port_hw(hwif, &hw);
Index: b/drivers/ide/arm/palm_bk3710.c
===================================================================
--- a/drivers/ide/arm/palm_bk3710.c
+++ b/drivers/ide/arm/palm_bk3710.c
@@ -386,7 +386,7 @@ static int __devinit palm_bk3710_probe(s
if (hwif->present)
ide_unregister(i, 0, 0);
- else if (!hwif->hold)
+ else
ide_init_port_data(hwif, i);
ide_init_port_hw(hwif, &hw);
Index: b/drivers/ide/legacy/ide-cs.c
===================================================================
--- a/drivers/ide/legacy/ide-cs.c
+++ b/drivers/ide/legacy/ide-cs.c
@@ -164,7 +164,7 @@ static int idecs_register(unsigned long
if (hwif->present)
ide_unregister(i);
- else if (!hwif->hold)
+ else
ide_init_port_data(hwif, i);
ide_init_port_hw(hwif, &hw);
Index: b/drivers/ide/mips/au1xxx-ide.c
===================================================================
--- a/drivers/ide/mips/au1xxx-ide.c
+++ b/drivers/ide/mips/au1xxx-ide.c
@@ -617,9 +617,6 @@ static int au_ide_probe(struct device *d
hwif->dev = dev;
- /* hold should be on in all cases */
- hwif->hold = 1;
-
hwif->mmio = 1;
/* If the user has selected DDMA assisted copies,
Index: b/drivers/ide/pci/delkin_cb.c
===================================================================
--- a/drivers/ide/pci/delkin_cb.c
+++ b/drivers/ide/pci/delkin_cb.c
@@ -86,7 +86,7 @@ delkin_cb_probe (struct pci_dev *dev, co
if (hwif->present)
ide_unregister(i);
- else if (!hwif->hold)
+ else
ide_init_port_data(hwif, i);
ide_init_port_hw(hwif, &hw);
Index: b/drivers/ide/ppc/pmac.c
===================================================================
--- a/drivers/ide/ppc/pmac.c
+++ b/drivers/ide/ppc/pmac.c
@@ -1120,7 +1120,6 @@ pmac_ide_setup_device(pmac_ide_hwif_t *p
hwif->hwif_data = pmif;
ide_init_port_hw(hwif, hw);
hwif->noprobe = pmif->mediabay;
- hwif->hold = pmif->mediabay;
hwif->cbl = pmif->cable_80 ? ATA_CBL_PATA80 : ATA_CBL_PATA40;
hwif->set_pio_mode = pmac_ide_set_pio_mode;
if (pmif->kind == controller_un_ata6
Index: b/include/linux/ide.h
===================================================================
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -573,7 +573,6 @@ typedef struct hwif_s {
unsigned noprobe : 1; /* don't probe for this interface */
unsigned present : 1; /* this interface exists */
- unsigned hold : 1; /* this interface is always present */
unsigned serialized : 1; /* serialized all channel operation */
unsigned sharing_irq: 1; /* 1 = sharing irq with another hwif */
unsigned reset : 1; /* reset after probe */
next reply other threads:[~2008-02-09 17:40 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-09 17:54 Bartlomiej Zolnierkiewicz [this message]
2008-02-09 17:48 ` [PATCH] ide: remove ->hold field from ide_hwif_t (take 2) Sergei Shtylyov
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=200802091854.07310.bzolnier@gmail.com \
--to=bzolnier@gmail.com \
--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