joel16/android_kernel_sony_msm8994_rework
1
0
Fork 0
mirror of https://github.com/joel16/android_kernel_sony_msm8994_rework.git synced 2024-12-20 02:48:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ide: remove stale ide.h "configuration options"

Browse Source 
Remove stale ide.h "configuration options":

* INITIAL_MULT_COUNT - always defined to 0

* SUPPORT_SLOW_DATA_PORTS - unused

* OK_TO_RESET_CONTROLLER - always defined to 1

* DISABLE_IRQ_NOSYNC - always defined to 0

Leave SUPPORT_VLB_SYNC (defined to 0 for CRIS and FRV, otherwise to 1)
for now but disallow overriding it by <asm/ide.h>.

There should be no functionality changes caused by this patch.

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz 2008-01-25 22:17:08 +01:00
parent f1ca6d37f9
commit 4ee06b7e67
8 changed files with 8 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/ide/ide-io.c
View File

@ -1469,12 +1469,8 @@ void ide_timer_expiry (unsigned long data)
*/ */
spin_unlock(&ide_lock); spin_unlock(&ide_lock);
hwif = HWIF(drive); hwif = HWIF(drive);
#if DISABLE_IRQ_NOSYNC
disable_irq_nosync(hwif->irq);
#else
/* disable_irq_nosync ?? */ /* disable_irq_nosync ?? */
disable_irq(hwif->irq); disable_irq(hwif->irq);
#endif /* DISABLE_IRQ_NOSYNC */
/* local CPU only, /* local CPU only,
* as if we were handling an interrupt */ * as if we were handling an interrupt */
local_irq_disable(); local_irq_disable();

9
drivers/ide/ide-iops.c
View File

@ -1050,8 +1050,7 @@ static void ide_disk_pre_reset(ide_drive_t *drive)
drive->special.all = 0; drive->special.all = 0;
drive->special.b.set_geometry = legacy; drive->special.b.set_geometry = legacy;
drive->special.b.recalibrate = legacy; drive->special.b.recalibrate = legacy;
if (OK_TO_RESET_CONTROLLER) drive->mult_count = 0;
drive->mult_count = 0;
if (!drive->keep_settings && !drive->using_dma) if (!drive->keep_settings && !drive->using_dma)
drive->mult_req = 0; drive->mult_req = 0;
if (drive->mult_req != drive->mult_count) if (drive->mult_req != drive->mult_count)
@ -1136,7 +1135,6 @@ static ide_startstop_t do_reset1 (ide_drive_t *drive, int do_not_try_atapi)
for (unit = 0; unit < MAX_DRIVES; ++unit) for (unit = 0; unit < MAX_DRIVES; ++unit)
pre_reset(&hwif->drives[unit]); pre_reset(&hwif->drives[unit]);
#if OK_TO_RESET_CONTROLLER
if (!IDE_CONTROL_REG) { if (!IDE_CONTROL_REG) {
spin_unlock_irqrestore(&ide_lock, flags); spin_unlock_irqrestore(&ide_lock, flags);
return ide_stopped; return ide_stopped;
@ -1173,11 +1171,8 @@ static ide_startstop_t do_reset1 (ide_drive_t *drive, int do_not_try_atapi)
* state when the disks are reset this way. At least, the Winbond * state when the disks are reset this way. At least, the Winbond
* 553 documentation says that * 553 documentation says that
*/ */
if (hwif->resetproc != NULL) { if (hwif->resetproc)
hwif->resetproc(drive); hwif->resetproc(drive);
}
#endif /* OK_TO_RESET_CONTROLLER */
spin_unlock_irqrestore(&ide_lock, flags); spin_unlock_irqrestore(&ide_lock, flags);
return ide_started; return ide_started;

4
drivers/ide/ide-probe.c
View File

@ -95,10 +95,10 @@ static void ide_disk_init_mult_count(ide_drive_t *drive)
#ifdef CONFIG_IDEDISK_MULTI_MODE #ifdef CONFIG_IDEDISK_MULTI_MODE
id->multsect = ((id->max_multsect/2) > 1) ? id->max_multsect : 0; id->multsect = ((id->max_multsect/2) > 1) ? id->max_multsect : 0;
id->multsect_valid = id->multsect ? 1 : 0; id->multsect_valid = id->multsect ? 1 : 0;
drive->mult_req = id->multsect_valid ? id->max_multsect : INITIAL_MULT_COUNT; drive->mult_req = id->multsect_valid ? id->max_multsect : 0;
drive->special.b.set_multmode = drive->mult_req ? 1 : 0; drive->special.b.set_multmode = drive->mult_req ? 1 : 0;
#else /* original, pre IDE-NFG, per request of AC */ #else /* original, pre IDE-NFG, per request of AC */
drive->mult_req = INITIAL_MULT_COUNT; drive->mult_req = 0;
if (drive->mult_req > id->max_multsect) if (drive->mult_req > id->max_multsect)
drive->mult_req = id->max_multsect; drive->mult_req = id->max_multsect;
if (drive->mult_req || ((id->multsect_valid & 1) && id->multsect)) if (drive->mult_req || ((id->multsect_valid & 1) && id->multsect))

5
include/asm-cris/arch-v10/ide.h
View File

@ -89,11 +89,6 @@ static inline void ide_init_default_hwifs(void)
} }
} }
/* some configuration options we don't need */
#undef SUPPORT_VLB_SYNC
#define SUPPORT_VLB_SYNC 0
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* __ASMCRIS_IDE_H */ #endif /* __ASMCRIS_IDE_H */

5
include/asm-cris/arch-v32/ide.h
View File

@ -48,11 +48,6 @@ static inline unsigned long ide_default_io_base(int index)
return REG_TYPE_CONV(unsigned long, reg_ata_rw_ctrl2, ctrl2); return REG_TYPE_CONV(unsigned long, reg_ata_rw_ctrl2, ctrl2);
} }
/* some configuration options we don't need */
#undef SUPPORT_VLB_SYNC
#define SUPPORT_VLB_SYNC 0
#define IDE_ARCH_ACK_INTR #define IDE_ARCH_ACK_INTR
#define ide_ack_intr(hwif) ((hwif)->ack_intr(hwif)) #define ide_ack_intr(hwif) ((hwif)->ack_intr(hwif))

6
include/asm-frv/ide.h
View File

@ -18,12 +18,6 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/irq.h> #include <asm/irq.h>
#undef SUPPORT_SLOW_DATA_PORTS
#define SUPPORT_SLOW_DATA_PORTS 0
#undef SUPPORT_VLB_SYNC
#define SUPPORT_VLB_SYNC 0
#ifndef MAX_HWIFS #ifndef MAX_HWIFS
#define MAX_HWIFS 8 #define MAX_HWIFS 8
#endif #endif

3
include/asm-powerpc/ide.h
View File

@ -42,9 +42,6 @@ struct ide_machdep_calls {
extern struct ide_machdep_calls ppc_ide_md; extern struct ide_machdep_calls ppc_ide_md;
#undef SUPPORT_SLOW_DATA_PORTS
#define SUPPORT_SLOW_DATA_PORTS 0
#define IDE_ARCH_OBSOLETE_DEFAULTS #define IDE_ARCH_OBSOLETE_DEFAULTS
static __inline__ int ide_default_irq(unsigned long base) static __inline__ int ide_default_irq(unsigned long base)

27
include/linux/ide.h
View File

@ -27,25 +27,10 @@
#include <asm/semaphore.h> #include <asm/semaphore.h>
#include <asm/mutex.h> #include <asm/mutex.h>
/****************************************************************************** #if defined(CRIS) || defined(FRV)
* IDE driver configuration options (play with these as desired): # define SUPPORT_VLB_SYNC 0
* #else
* REALLY_SLOW_IO can be defined in ide.c and ide-cd.c, if necessary # define SUPPORT_VLB_SYNC 1
*/
#define INITIAL_MULT_COUNT 0 /* off=0; on=2,4,8,16,32, etc.. */
#ifndef SUPPORT_SLOW_DATA_PORTS /* 1 to support slow data ports */
#define SUPPORT_SLOW_DATA_PORTS 1 /* 0 to reduce kernel size */
#endif
#ifndef SUPPORT_VLB_SYNC /* 1 to support weird 32-bit chips */
#define SUPPORT_VLB_SYNC 1 /* 0 to reduce kernel size */
#endif
#ifndef OK_TO_RESET_CONTROLLER /* 1 needed for good error recovery */
#define OK_TO_RESET_CONTROLLER 1 /* 0 for use with AH2372A/B interface */
#endif
#ifndef DISABLE_IRQ_NOSYNC
#define DISABLE_IRQ_NOSYNC 0
#endif #endif
/* /*
@ -55,10 +40,6 @@
#define IDE_NO_IRQ (-1) #define IDE_NO_IRQ (-1)
/*
* "No user-serviceable parts" beyond this point :)
*****************************************************************************/
typedef unsigned char byte; /* used everywhere */ typedef unsigned char byte; /* used everywhere */
/* /*