Bartlomiej Zolnierkiewicz | 3 Feb 16:55 2004
Picon
Picon

[PATCH] remove unused ide_devices_t from ide.c and ide.h


Introduced in 2.4.21 and never used.

 linux-2.6.2-rc3-bk3-root/drivers/ide/ide.c   |   12 ------------
 linux-2.6.2-rc3-bk3-root/include/linux/ide.h |   14 --------------
 2 files changed, 26 deletions(-)

diff -puN drivers/ide/ide.c~ide_devices_cleanup drivers/ide/ide.c
--- linux-2.6.2-rc3-bk3/drivers/ide/ide.c~ide_devices_cleanup	2004-02-03 15:57:04.080097824 +0100
+++ linux-2.6.2-rc3-bk3-root/drivers/ide/ide.c	2004-02-03 15:57:04.091096152 +0100
 <at>  <at>  -197,18 +197,6  <at>  <at>  ide_hwif_t ide_hwifs[MAX_HWIFS];	/* mast

 EXPORT_SYMBOL(ide_hwifs);

-ide_devices_t *idedisk;
-ide_devices_t *idecd;
-ide_devices_t *idefloppy;
-ide_devices_t *idetape;
-ide_devices_t *idescsi;
-
-EXPORT_SYMBOL(idedisk);
-EXPORT_SYMBOL(idecd);
-EXPORT_SYMBOL(idefloppy);
-EXPORT_SYMBOL(idetape);
-EXPORT_SYMBOL(idescsi);
-
 extern ide_driver_t idedefault_driver;
 static void setup_driver_defaults(ide_driver_t *driver);

diff -puN include/linux/ide.h~ide_devices_cleanup include/linux/ide.h
(Continue reading)

Bartlomiej Zolnierkiewicz | 3 Feb 16:53 2004
Picon
Picon

[PATCH] ide-io.c: remove unused unplugged iops


Introduced in 2.4.21 and never used.

 linux-2.6.2-rc3-bk3-root/drivers/ide/ide-iops.c |   69 ------------------------
 1 files changed, 69 deletions(-)

diff -puN drivers/ide/ide-iops.c~ide_unplugged_iops_cleanup drivers/ide/ide-iops.c
--- linux-2.6.2-rc3-bk3/drivers/ide/ide-iops.c~ide_unplugged_iops_cleanup	2004-02-03
15:55:30.125381112 +0100
+++ linux-2.6.2-rc3-bk3-root/drivers/ide/ide-iops.c	2004-02-03 15:55:30.137379288 +0100
 <at>  <at>  -31,75 +31,6  <at>  <at> 
 #include <asm/bitops.h>

 /*
- *	IDE operator we assign to an unplugged device so that
- *	we don't trash new hardware assigned the same resources
- */
- 
-static u8 ide_unplugged_inb (unsigned long port)
-{
-	return 0xFF;
-}
-
-static u16 ide_unplugged_inw (unsigned long port)
-{
-	return 0xFFFF;
-}
-
-static void ide_unplugged_insw (unsigned long port, void *addr, u32 count)
-{
(Continue reading)

Bartlomiej Zolnierkiewicz | 3 Feb 16:56 2004
Picon
Picon

[PATCH] remove unused __ide_dma_retune() and ide_hwif_t->ide_dma_retune


First introduced in 2.3.99-pre3 (added to ide_dmaproc) and never used.

 linux-2.6.2-rc3-bk3-root/drivers/ide/ide-dma.c     |   18 ------------------
 linux-2.6.2-rc3-bk3-root/drivers/ide/ide.c         |    1 -
 linux-2.6.2-rc3-bk3-root/drivers/ide/pci/sgiioc4.c |    1 -
 linux-2.6.2-rc3-bk3-root/drivers/ide/ppc/pmac.c    |    1 -
 linux-2.6.2-rc3-bk3-root/include/linux/ide.h       |    3 ---
 5 files changed, 24 deletions(-)

diff -puN drivers/ide/ide.c~ide_dma_retune_cleanup drivers/ide/ide.c
--- linux-2.6.2-rc3-bk3/drivers/ide/ide.c~ide_dma_retune_cleanup	2004-02-03
15:58:42.869079616 +0100
+++ linux-2.6.2-rc3-bk3-root/drivers/ide/ide.c	2004-02-03 15:58:42.890076424 +0100
 <at>  <at>  -846,7 +846,6  <at>  <at>  void ide_unregister (unsigned int index)
 	hwif->ide_dma_good_drive	= old_hwif.ide_dma_good_drive;
 	hwif->ide_dma_count		= old_hwif.ide_dma_count;
 	hwif->ide_dma_verbose		= old_hwif.ide_dma_verbose;
-	hwif->ide_dma_retune		= old_hwif.ide_dma_retune;
 	hwif->ide_dma_lostirq		= old_hwif.ide_dma_lostirq;
 	hwif->ide_dma_timeout		= old_hwif.ide_dma_timeout;
 	hwif->ide_dma_queued_on		= old_hwif.ide_dma_queued_on;
diff -puN drivers/ide/ide-dma.c~ide_dma_retune_cleanup drivers/ide/ide-dma.c
--- linux-2.6.2-rc3-bk3/drivers/ide/ide-dma.c~ide_dma_retune_cleanup	2004-02-03
15:58:42.872079160 +0100
+++ linux-2.6.2-rc3-bk3-root/drivers/ide/ide-dma.c	2004-02-03 15:58:42.892076120 +0100
 <at>  <at>  -850,22 +850,6  <at>  <at>  int __ide_dma_verbose (ide_drive_t *driv

 EXPORT_SYMBOL(__ide_dma_verbose);

(Continue reading)

Bartlomiej Zolnierkiewicz | 3 Feb 20:41 2004
Picon
Picon

Re: [PATCH] various IDE patches/cleanups


Hi,

On Friday 30 of January 2004 04:27, you wrote:
> I've been doing some hacking on the IDE layer, just to fix a few issues I
> noticed going through the code. Due to the complex nature of the code I'm
> bound to have missed some things and perhaps misunderstood others.
> Nevertheless I'm posting these patches in the hope that they can be tested
> on other machines, rejected, or even accepted.
>
> Comments and criticisms are welcome.

Thanks!  I'm slowly reading through them (yeah, code is really complex).
Patch 3rd and 5th seems okay, 2nd and 4th need some more checking/thinking.

> The first patch, below, is already included in the -mm tree. The further
> patches are appearing here for the first time.

It was pushed to Linus and merged.

--bart

-
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo <at> vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Bartlomiej Zolnierkiewicz | 4 Feb 02:35 2004
Picon
Picon

[PATCH] remove dead CONFIG_IDEDMA_NEW_DRIVE_LISTINGS


[PATCH] remove dead CONFIG_IDEDMA_NEW_DRIVE_LISTINGS

Leftover after switch to IDE DMA Model-Firmware blacklist in kernel 2.5.63.

 linux-2.6.2-rc3-bk3-root/arch/arm/configs/footbridge_defconfig |    1 
 linux-2.6.2-rc3-bk3-root/drivers/ide/Kconfig                   |   11 ----------
 2 files changed, 12 deletions(-)

diff -puN arch/arm/configs/footbridge_defconfig~CONFIG_IDEDMA_NEW_DRIVE_LISTINGS_cleanup arch/arm/configs/footbridge_defconfig
---
linux-2.6.2-rc3-bk3/arch/arm/configs/footbridge_defconfig~CONFIG_IDEDMA_NEW_DRIVE_LISTINGS_cleanup	2004-02-04
01:21:44.930307560 +0100
+++ linux-2.6.2-rc3-bk3-root/arch/arm/configs/footbridge_defconfig	2004-02-04
01:21:59.000000000 +0100
 <at>  <at>  -399,7 +399,6  <at>  <at>  CONFIG_BLK_DEV_IDEDMA_PCI=y
 CONFIG_BLK_DEV_OFFBOARD=y
 CONFIG_IDEDMA_PCI_AUTO=y
 CONFIG_BLK_DEV_IDEDMA=y
-# CONFIG_IDEDMA_NEW_DRIVE_LISTINGS is not set
 # CONFIG_BLK_DEV_AEC62XX is not set
 # CONFIG_AEC62XX_TUNING is not set
 # CONFIG_BLK_DEV_ALI15X3 is not set
diff -puN drivers/ide/Kconfig~CONFIG_IDEDMA_NEW_DRIVE_LISTINGS_cleanup drivers/ide/Kconfig
---
linux-2.6.2-rc3-bk3/drivers/ide/Kconfig~CONFIG_IDEDMA_NEW_DRIVE_LISTINGS_cleanup	2004-02-04
01:17:57.000000000 +0100
+++ linux-2.6.2-rc3-bk3-root/drivers/ide/Kconfig	2004-02-04 01:18:40.000000000 +0100
 <at>  <at>  -521,17 +521,6  <at>  <at>  config IDEDMA_PCI_WIP

(Continue reading)

Bartlomiej Zolnierkiewicz | 4 Feb 02:35 2004
Picon
Picon

[PATCH] remove CONFIG_IDEDMA_PCI_WIP


[PATCH] remove CONFIG_IDEDMA_PCI_WIP

Fix CONFIG_HPT34X_AUTODMA to depend directly on CONFIG_EXPERIMENTAL
and finally remove CONFIG_IDEDMA_PCI_WIP.

 linux-2.6.2-rc3-bk3-root/arch/alpha/defconfig                 |    1 
 linux-2.6.2-rc3-bk3-root/arch/arm/configs/iq80321_defconfig   |    1 
 linux-2.6.2-rc3-bk3-root/arch/arm/configs/netwinder_defconfig |    1 
 linux-2.6.2-rc3-bk3-root/arch/i386/defconfig                  |    1 
 linux-2.6.2-rc3-bk3-root/arch/ia64/configs/generic_defconfig  |    1 
 linux-2.6.2-rc3-bk3-root/arch/ia64/configs/sn2_defconfig      |    1 
 linux-2.6.2-rc3-bk3-root/arch/ia64/defconfig                  |    1 
 linux-2.6.2-rc3-bk3-root/arch/mips/defconfig-lasat200         |    1 
 linux-2.6.2-rc3-bk3-root/arch/ppc/configs/common_defconfig    |    1 
 linux-2.6.2-rc3-bk3-root/arch/ppc/configs/pmac_defconfig      |    1 
 linux-2.6.2-rc3-bk3-root/arch/ppc/defconfig                   |    1 
 linux-2.6.2-rc3-bk3-root/arch/sparc64/defconfig               |    1 
 linux-2.6.2-rc3-bk3-root/arch/x86_64/defconfig                |    1 
 linux-2.6.2-rc3-bk3-root/drivers/ide/Kconfig                  |   14 +---------
 14 files changed, 2 insertions(+), 25 deletions(-)

diff -puN arch/alpha/defconfig~CONFIG_IDEDMA_PCI_WIP_cleanup arch/alpha/defconfig
--- linux-2.6.2-rc3-bk3/arch/alpha/defconfig~CONFIG_IDEDMA_PCI_WIP_cleanup	2004-02-04
01:45:57.635462808 +0100
+++ linux-2.6.2-rc3-bk3-root/arch/alpha/defconfig	2004-02-04 01:46:02.909661008 +0100
 <at>  <at>  -155,7 +155,6  <at>  <at>  CONFIG_BLK_DEV_IDEDMA_PCI=y
 CONFIG_IDEDMA_PCI_AUTO=y
 # CONFIG_IDEDMA_ONLYDISK is not set
 CONFIG_BLK_DEV_IDEDMA=y
(Continue reading)

Bartlomiej Zolnierkiewicz | 3 Feb 21:15 2004
Picon
Picon

[PATCH] [IDE] remove ide_dma_queued_* ops from ide_hwif_t


Jens, could you take a look?

--bart

TCQ code is host independent so remove redundant ide_dma_queued_* ops from
ide_hwif_t.  If we ever decide to bring back TCQ support this will fix OOPS
in ide-disk driver with CONFIG_BLK_DEV_IDE_TCQ_DEFAULT=y and icside/sgiioc4
host drivers (it will also enable TCQ support for these host drivers).

 linux-2.6.2-rc3-bk3-root/drivers/ide/ide-disk.c     |   20 +++++++----------
 linux-2.6.2-rc3-bk3-root/drivers/ide/ide-dma.c      |   23 ++------------------
 linux-2.6.2-rc3-bk3-root/drivers/ide/ide-taskfile.c |    6 +++--
 linux-2.6.2-rc3-bk3-root/drivers/ide/ide-tcq.c      |    4 +--
 linux-2.6.2-rc3-bk3-root/drivers/ide/ide.c          |    7 ------
 linux-2.6.2-rc3-bk3-root/drivers/ide/ppc/pmac.c     |    7 ------
 linux-2.6.2-rc3-bk3-root/include/linux/ide.h        |   23 --------------------
 7 files changed, 18 insertions(+), 72 deletions(-)

diff -puN drivers/ide/ide.c~ide_dma_queued_cleanup drivers/ide/ide.c
--- linux-2.6.2-rc3-bk3/drivers/ide/ide.c~ide_dma_queued_cleanup	2004-02-03
18:59:54.082285872 +0100
+++ linux-2.6.2-rc3-bk3-root/drivers/ide/ide.c	2004-02-03 19:00:18.410587408 +0100
 <at>  <at>  -848,13 +848,6  <at>  <at>  void ide_unregister (unsigned int index)
 	hwif->ide_dma_verbose		= old_hwif.ide_dma_verbose;
 	hwif->ide_dma_lostirq		= old_hwif.ide_dma_lostirq;
 	hwif->ide_dma_timeout		= old_hwif.ide_dma_timeout;
-	hwif->ide_dma_queued_on		= old_hwif.ide_dma_queued_on;
-	hwif->ide_dma_queued_off	= old_hwif.ide_dma_queued_off;
-#ifdef CONFIG_BLK_DEV_IDE_TCQ
(Continue reading)

Jens Axboe | 4 Feb 11:34 2004
Picon

Re: [PATCH] [IDE] remove ide_dma_queued_* ops from ide_hwif_t

On Tue, Feb 03 2004, Bartlomiej Zolnierkiewicz wrote:
> 
> Jens, could you take a look?

Looks fine!

--

-- 
Jens Axboe

-
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo <at> vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Bartlomiej Zolnierkiewicz | 4 Feb 16:47 2004
Picon
Picon

[PATCH] [IDE] fix duplication of DMA {black,white}list in icside.c


Always compile ide-dma.c if CONFIG_BLK_DEV_IDEDMA=y, mark PCI specific code
with CONFIG_BLK_DEV_IDEDMA_PCI for now (it should migrate to ide_pcidma.c
over a time).  This fixes a small bug - in_drive_list() from icside.c used
!strstr() instead of strstr() so it was missing two entries from a blacklist.

 linux-2.6.2-root/drivers/ide/Makefile     |    2 
 linux-2.6.2-root/drivers/ide/arm/icside.c |   73 ------------------------------
 linux-2.6.2-root/drivers/ide/ide-dma.c    |   19 ++++---
 linux-2.6.2-root/include/linux/ide.h      |    8 ++-
 4 files changed, 21 insertions(+), 81 deletions(-)

diff -puN drivers/ide/arm/icside.c~ide_dma_drive_lists drivers/ide/arm/icside.c
--- linux-2.6.2/drivers/ide/arm/icside.c~ide_dma_drive_lists	2004-02-04 16:27:52.765871888 +0100
+++ linux-2.6.2-root/drivers/ide/arm/icside.c	2004-02-04 16:27:52.783869152 +0100
 <at>  <at>  -330,72 +330,6  <at>  <at>  static int icside_set_speed(ide_drive_t 
 	return on;
 }

-/*
- * The following is a sick duplication from ide-dma.c ;(
- *
- * This should be defined in one place only.
- */
-struct drive_list_entry {
-	const char * id_model;
-	const char * id_firmware;
-};
-
-static const struct drive_list_entry drive_whitelist [] = {
(Continue reading)

Davin McCall | 5 Feb 04:51 2004
Picon

Re: [PATCH] various IDE patches/cleanups

Hi,

On Tue, 3 Feb 2004 20:41:09 +0100
Bartlomiej Zolnierkiewicz <B.Zolnierkiewicz <at> elka.pw.edu.pl> wrote:

> Thanks!  I'm slowly reading through them (yeah, code is really complex).

I'm also trying to put together some brief documentation on how the code/data structures fit together.
Perhaps I should post it when I'm done? Might be useful for anyone else looking at the IDE layer.

> Patch 3rd and 5th seems okay, 2nd and 4th need some more checking/thinking.

3rd and 5th are also the most worthwhile, I think. 2nd and 4th are really only optimizations. Hopefully
there are no problems with them, though.

> > The first patch, below, is already included in the -mm tree. The further
> > patches are appearing here for the first time.
> 
> It was pushed to Linus and merged.

Good :-)  Considering how many tries it took me to get it right, I'm glad it's gotten in...

/Davin
-
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo <at> vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Gmane