lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ide: remove 'byte' typedef

Browse Source 
Just use u8 instead, also s/__u8/u8/ in ide-cd.h while at it.

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz
2009-01-06 17:20:53 +01:00
parent c0ae502347
commit 9892ec5497
5 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/ide/ide-cd.h
View File

@@ -33,33 +33,33 @@
/* Structure of a MSF cdrom address. */ /* Structure of a MSF cdrom address. */
struct atapi_msf { struct atapi_msf {
byte reserved; u8 reserved;
byte minute; u8 minute;
byte second; u8 second;
byte frame; u8 frame;
}; };
/* Space to hold the disk TOC. */ /* Space to hold the disk TOC. */
#define MAX_TRACKS 99 #define MAX_TRACKS 99
struct atapi_toc_header { struct atapi_toc_header {
unsigned short toc_length; unsigned short toc_length;
byte first_track; u8 first_track;
byte last_track; u8 last_track;
}; };
struct atapi_toc_entry { struct atapi_toc_entry {
byte reserved1; u8 reserved1;
#if defined(__BIG_ENDIAN_BITFIELD) #if defined(__BIG_ENDIAN_BITFIELD)
__u8 adr : 4; u8 adr : 4;
__u8 control : 4; u8 control : 4;
#elif defined(__LITTLE_ENDIAN_BITFIELD) #elif defined(__LITTLE_ENDIAN_BITFIELD)
__u8 control : 4; u8 control : 4;
__u8 adr : 4; u8 adr : 4;
#else #else
#error "Please fix <asm/byteorder.h>" #error "Please fix <asm/byteorder.h>"
#endif #endif
byte track; u8 track;
byte reserved2; u8 reserved2;
union { union {
unsigned lba; unsigned lba;
struct atapi_msf msf; struct atapi_msf msf;

4
drivers/ide/it821x.c
View File

@@ -279,7 +279,7 @@ static void it821x_set_pio_mode(ide_drive_t *drive, const u8 pio)
* the shared MWDMA/PIO timing register. * the shared MWDMA/PIO timing register.
*/ */
static void it821x_tune_mwdma (ide_drive_t *drive, byte mode_wanted) static void it821x_tune_mwdma(ide_drive_t *drive, u8 mode_wanted)
{ {
ide_hwif_t *hwif = drive->hwif; ide_hwif_t *hwif = drive->hwif;
struct pci_dev *dev = to_pci_dev(hwif->dev); struct pci_dev *dev = to_pci_dev(hwif->dev);
@@ -316,7 +316,7 @@ static void it821x_tune_mwdma (ide_drive_t *drive, byte mode_wanted)
* controller when doing UDMA modes in pass through. * controller when doing UDMA modes in pass through.
*/ */
static void it821x_tune_udma (ide_drive_t *drive, byte mode_wanted) static void it821x_tune_udma(ide_drive_t *drive, u8 mode_wanted)
{ {
ide_hwif_t *hwif = drive->hwif; ide_hwif_t *hwif = drive->hwif;
struct pci_dev *dev = to_pci_dev(hwif->dev); struct pci_dev *dev = to_pci_dev(hwif->dev);

4
drivers/ide/qd65xx.h
View File

@@ -31,8 +31,8 @@
#define QD_CONFIG(hwif) ((hwif)->config_data & 0x00ff) #define QD_CONFIG(hwif) ((hwif)->config_data & 0x00ff)
#define QD_TIMING(drive) (byte)(((drive)->drive_data) & 0x00ff) #define QD_TIMING(drive) (u8)(((drive)->drive_data) & 0x00ff)
#define QD_TIMREG(drive) (byte)((((drive)->drive_data) & 0xff00) >> 8) #define QD_TIMREG(drive) (u8)((((drive)->drive_data) & 0xff00) >> 8)
#define QD6500_DEF_DATA ((QD_TIM1_PORT<<8) | (QD_ID3 ? 0x0c : 0x08)) #define QD6500_DEF_DATA ((QD_TIM1_PORT<<8) | (QD_ID3 ? 0x0c : 0x08))
#define QD6580_DEF_DATA ((QD_TIM1_PORT<<8) | (QD_ID3 ? 0x0a : 0x00)) #define QD6580_DEF_DATA ((QD_TIM1_PORT<<8) | (QD_ID3 ? 0x0a : 0x00))

2
drivers/ide/sc1200.c
View File

@@ -172,7 +172,7 @@ static int sc1200_dma_end(ide_drive_t *drive)
{ {
ide_hwif_t *hwif = drive->hwif; ide_hwif_t *hwif = drive->hwif;
unsigned long dma_base = hwif->dma_base; unsigned long dma_base = hwif->dma_base;
byte dma_stat; u8 dma_stat;
dma_stat = inb(dma_base+2); /* get DMA status */ dma_stat = inb(dma_base+2); /* get DMA status */

4
include/linux/ide.h
View File

@@ -32,8 +32,6 @@
# define SUPPORT_VLB_SYNC 1 # define SUPPORT_VLB_SYNC 1
#endif #endif
typedef unsigned char byte; /* used everywhere */
/* /*
* Probably not wise to fiddle with these * Probably not wise to fiddle with these
*/ */
@@ -1161,7 +1159,7 @@ void ide_pad_transfer(ide_drive_t *, int, int);
ide_startstop_t __ide_error(ide_drive_t *, struct request *, u8, u8); ide_startstop_t __ide_error(ide_drive_t *, struct request *, u8, u8);
ide_startstop_t ide_error (ide_drive_t *drive, const char *msg, byte stat); ide_startstop_t ide_error(ide_drive_t *, const char *, u8);
void ide_fix_driveid(u16 *); void ide_fix_driveid(u16 *);