summaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
Diffstat (limited to 'linux')
-rw-r--r--linux/dev/drivers/block/ide.c18
-rw-r--r--linux/dev/include/linux/blk.h38
-rw-r--r--linux/src/include/linux/cdrom.h40
-rw-r--r--linux/src/include/linux/md.h10
4 files changed, 53 insertions, 53 deletions
diff --git a/linux/dev/drivers/block/ide.c b/linux/dev/drivers/block/ide.c
index ee3c878..9444653 100644
--- a/linux/dev/drivers/block/ide.c
+++ b/linux/dev/drivers/block/ide.c
@@ -1606,7 +1606,7 @@ static inline void do_request (ide_hwif_t *hwif, struct request *rq)
printk("%s: drive not ready for command\n", drive->name);
return;
}
-
+
if (!drive->special.all) {
if (rq->cmd == IDE_DRIVE_CMD) {
execute_drive_cmd(drive, rq);
@@ -1646,7 +1646,7 @@ static inline void do_request (ide_hwif_t *hwif, struct request *rq)
#else
do_rw_disk (drive, rq, block); /* simpler and faster */
return;
-#endif /* CONFIG_BLK_DEV_IDEATAPI */;
+#endif /* CONFIG_BLK_DEV_IDEATAPI */
}
do_special(drive);
return;
@@ -1696,7 +1696,7 @@ void ide_do_request (ide_hwgroup_t *hwgroup)
hwgroup->active = 0;
return; /* no work left for this hwgroup */
}
- got_rq:
+ got_rq:
do_request(hwgroup->hwif = hwgroup->next_hwif = hwif, hwgroup->rq = rq);
cli();
} while (hwgroup->handler == NULL);
@@ -2429,7 +2429,7 @@ static inline void do_identify (ide_drive_t *drive, byte cmd)
#if defined (CONFIG_SCSI_EATA_DMA) || defined (CONFIG_SCSI_EATA_PIO) || defined (CONFIG_SCSI_EATA)
/*
- * EATA SCSI controllers do a hardware ATA emulation:
+ * EATA SCSI controllers do a hardware ATA emulation:
* Ignore them if there is a driver for them available.
*/
if ((id->model[0] == 'P' && id->model[1] == 'M')
@@ -3321,7 +3321,7 @@ done:
* This routine is called from the partition-table code in genhd.c
* to "convert" a drive to a logical geometry with fewer than 1024 cyls.
*
- * The second parameter, "xparm", determines exactly how the translation
+ * The second parameter, "xparm", determines exactly how the translation
* will be handled:
* 0 = convert to CHS with fewer than 1024 cyls
* using the same method as Ontrack DiskManager.
@@ -3329,7 +3329,7 @@ done:
* -1 = similar to "0", plus redirect sector 0 to sector 1.
* >1 = convert to a CHS geometry with "xparm" heads.
*
- * Returns 0 if the translation was not possible, if the device was not
+ * Returns 0 if the translation was not possible, if the device was not
* an IDE disk drive, or if a geometry was "forced" on the commandline.
* Returns 1 if the geometry translation was successful.
*/
@@ -3640,7 +3640,7 @@ static int hwif_init (int h)
{
ide_hwif_t *hwif = &ide_hwifs[h];
void (*rfn)(void);
-
+
if (!hwif->present)
return 0;
if (!hwif->irq) {
@@ -3655,7 +3655,7 @@ static int hwif_init (int h)
return (hwif->present = 0);
}
#endif /* CONFIG_BLK_DEV_HD */
-
+
hwif->present = 0; /* we set it back to 1 if all is ok below */
switch (hwif->major) {
case IDE0_MAJOR: rfn = &do_ide0_request; break;
@@ -3710,7 +3710,7 @@ int ide_init (void)
#ifdef CONFIG_BLK_DEV_IDETAPE
idetape_register_chrdev(); /* Register character device interface to the ide tape */
#endif /* CONFIG_BLK_DEV_IDETAPE */
-
+
return 0;
}
diff --git a/linux/dev/include/linux/blk.h b/linux/dev/include/linux/blk.h
index ff4e46b..852853c 100644
--- a/linux/dev/include/linux/blk.h
+++ b/linux/dev/include/linux/blk.h
@@ -42,37 +42,37 @@
#ifdef CONFIG_CDU31A
extern int cdu31a_init(void);
-#endif CONFIG_CDU31A
+#endif /* CONFIG_CDU31A */
#ifdef CONFIG_MCD
extern int mcd_init(void);
-#endif CONFIG_MCD
+#endif /* CONFIG_MCD */
#ifdef CONFIG_MCDX
extern int mcdx_init(void);
-#endif CONFIG_MCDX
+#endif /* CONFIG_MCDX */
#ifdef CONFIG_SBPCD
extern int sbpcd_init(void);
-#endif CONFIG_SBPCD
+#endif /* CONFIG_SBPCD */
#ifdef CONFIG_AZTCD
extern int aztcd_init(void);
-#endif CONFIG_AZTCD
+#endif /* CONFIG_AZTCD */
#ifdef CONFIG_CDU535
extern int sony535_init(void);
-#endif CONFIG_CDU535
+#endif /* CONFIG_CDU535 */
#ifdef CONFIG_GSCD
extern int gscd_init(void);
-#endif CONFIG_GSCD
+#endif /* CONFIG_GSCD */
#ifdef CONFIG_CM206
extern int cm206_init(void);
-#endif CONFIG_CM206
+#endif /* CONFIG_CM206 */
#ifdef CONFIG_OPTCD
extern int optcd_init(void);
-#endif CONFIG_OPTCD
+#endif /* CONFIG_OPTCD */
#ifdef CONFIG_SJCD
extern int sjcd_init(void);
-#endif CONFIG_SJCD
+#endif /* CONFIG_SJCD */
#ifdef CONFIG_CDI_INIT
extern int cdi_init(void);
-#endif CONFIG_CDI_INIT
+#endif /* CONFIG_CDI_INIT */
#ifdef CONFIG_BLK_DEV_HD
extern int hd_init(void);
#endif
@@ -87,7 +87,7 @@ extern int loop_init(void);
#endif
#ifdef CONFIG_BLK_DEV_MD
extern int md_init(void);
-#endif CONFIG_BLK_DEV_MD
+#endif /* CONFIG_BLK_DEV_MD */
extern void set_device_ro(kdev_t dev,int flag);
void add_blkdev_randomness(int major);
@@ -115,7 +115,7 @@ void initrd_init(void);
if (!__err) set_device_ro((dev),get_fs_long((long *) (where))); return __err; } \
case BLKROGET: { int __err = verify_area(VERIFY_WRITE, (void *) (where), sizeof(long)); \
if (!__err) put_fs_long(0!=is_read_only(dev),(long *) (where)); return __err; }
-
+
#if defined(MAJOR_NR) || defined(IDE_DRIVER)
/*
@@ -134,7 +134,7 @@ void initrd_init(void);
#define DEVICE_NAME "ramdisk"
#define DEVICE_REQUEST rd_request
#define DEVICE_NR(device) (MINOR(device))
-#define DEVICE_ON(device)
+#define DEVICE_ON(device)
#define DEVICE_OFF(device)
#define DEVICE_NO_RANDOM
@@ -164,7 +164,7 @@ static void floppy_off(unsigned int nr);
#elif (MAJOR_NR == SCSI_DISK_MAJOR)
#define DEVICE_NAME "scsidisk"
-#define DEVICE_INTR do_sd
+#define DEVICE_INTR do_sd
#define TIMEOUT_VALUE (2*HZ)
#define DEVICE_REQUEST do_sd_request
#define DEVICE_NR(device) (MINOR(device) >> 4)
@@ -183,7 +183,7 @@ static void floppy_off(unsigned int nr);
#elif (MAJOR_NR == SCSI_TAPE_MAJOR)
#define DEVICE_NAME "scsitape"
-#define DEVICE_INTR do_st
+#define DEVICE_INTR do_st
#define DEVICE_NR(device) (MINOR(device) & 0x7f)
#define DEVICE_ON(device)
#define DEVICE_OFF(device)
@@ -347,7 +347,7 @@ else \
#endif /* DEVICE_TIMEOUT */
static void (DEVICE_REQUEST)(void);
-
+
#ifdef DEVICE_INTR
#define CLEAR_INTR SET_INTR(NULL)
#else
@@ -415,11 +415,11 @@ static void end_request(int uptodate) {
if ((bh = req->bh) != NULL) {
req->bh = bh->b_reqnext;
bh->b_reqnext = NULL;
-
+
/*
* This is our 'MD IO has finished' event handler.
* note that b_state should be cached in a register
- * anyways, so the overhead if this checking is almost
+ * anyways, so the overhead if this checking is almost
* zero. But anyways .. we never get OO for free :)
*/
if (test_bit(BH_MD, &bh->b_state)) {
diff --git a/linux/src/include/linux/cdrom.h b/linux/src/include/linux/cdrom.h
index 24aced5..022d6e1 100644
--- a/linux/src/include/linux/cdrom.h
+++ b/linux/src/include/linux/cdrom.h
@@ -67,14 +67,14 @@
* CDROM IOCTL structures
*/
-struct cdrom_blk
+struct cdrom_blk
{
unsigned from;
unsigned short len;
};
-struct cdrom_msf
+struct cdrom_msf
{
u_char cdmsf_min0; /* start minute */
u_char cdmsf_sec0; /* start second */
@@ -84,7 +84,7 @@ struct cdrom_msf
u_char cdmsf_frame1; /* end frame */
};
-struct cdrom_ti
+struct cdrom_ti
{
u_char cdti_trk0; /* start track */
u_char cdti_ind0; /* start index */
@@ -92,7 +92,7 @@ struct cdrom_ti
u_char cdti_ind1; /* end index */
};
-struct cdrom_tochdr
+struct cdrom_tochdr
{
u_char cdth_trk0; /* start track */
u_char cdth_trk1; /* end track */
@@ -111,7 +111,7 @@ union cdrom_addr /* address in either MSF or logical format */
int lba;
};
-struct cdrom_tocentry
+struct cdrom_tocentry
{
u_char cdte_track;
u_char cdte_adr :4;
@@ -137,7 +137,7 @@ struct cdrom_tocentry
*/
#define CDROM_LEADOUT 0xAA
-struct cdrom_subchnl
+struct cdrom_subchnl
{
u_char cdsc_format;
u_char cdsc_audiostatus;
@@ -171,7 +171,7 @@ struct cdrom_volctrl
u_char channel3;
};
-struct cdrom_read
+struct cdrom_read
{
int cdread_lba;
caddr_t cdread_bufaddr;
@@ -206,7 +206,7 @@ struct cdrom_multisession
#define CDROM_MODE1_SIZE 512
#else
#define CDROM_MODE1_SIZE 2048
-#endif FIVETWELVE
+#endif /* FIVETWELVE */
#define CDROM_MODE2_SIZE 2336
/*
@@ -243,7 +243,7 @@ struct cdrom_multisession
* enable (1) / disable (0) auto-ejecting
*/
#define CDROMEJECT_SW 0x530f /* arg: 0 or 1 */
-
+
/*
* obtain the start-of-last-session address of multi session disks
*/
@@ -259,19 +259,19 @@ struct cdrom_multisession
#define CDROMVOLREAD 0x5313 /* let the drive tell its volume setting */
/* (struct cdrom_volctrl) */
-/*
+/*
* these ioctls are used in aztcd.c and optcd.c
*/
#define CDROMREADRAW 0x5314 /* read data in raw mode */
#define CDROMREADCOOKED 0x5315 /* read data in cooked mode */
#define CDROMSEEK 0x5316 /* seek msf address */
-
+
/*
* for playing audio in logical block addressing mode
*/
#define CDROMPLAYBLK 0x5317 /* (struct cdrom_blk) */
-/*
+/*
* these ioctls are used in optcd.c
*/
#define CDROMREADALL 0x5318 /* read all 2646 bytes */
@@ -316,7 +316,7 @@ struct cdrom_multisession
/*
* CD-ROM capacity structure.
*/
-struct scsi_capacity
+struct scsi_capacity
{
u_long capacity;
u_long lbasize;
@@ -335,7 +335,7 @@ struct scsi_capacity
/*
* standard mode-select header prepended to all mode-select commands
*/
-struct ccs_modesel_head
+struct ccs_modesel_head
{
u_char _r1; /* reserved */
u_char medium; /* device-specific medium type */
@@ -353,7 +353,7 @@ struct ccs_modesel_head
/*
* error recovery parameters
*/
-struct ccs_err_recovery
+struct ccs_err_recovery
{
u_char _r1 : 2; /* reserved */
u_char page_code : 6; /* page code */
@@ -376,7 +376,7 @@ struct ccs_err_recovery
/*
* disco/reco parameters
*/
-struct ccs_disco_reco
+struct ccs_disco_reco
{
u_char _r1 : 2; /* reserved */
u_char page_code : 6; /* page code */
@@ -392,7 +392,7 @@ struct ccs_disco_reco
/*
* drive geometry parameters
*/
-struct ccs_geometry
+struct ccs_geometry
{
u_char _r1 : 2; /* reserved */
u_char page_code : 6; /* page code */
@@ -419,7 +419,7 @@ struct ccs_geometry
/*
* cache parameters
*/
-struct ccs_cache
+struct ccs_cache
{
u_char _r1 : 2; /* reserved */
u_char page_code : 6; /* page code */
@@ -433,13 +433,13 @@ struct ccs_cache
u_char _r2[8];
};
-#endif _LINUX_CDROM_H
+#endif /* _LINUX_CDROM_H */
/*==========================================================================*/
/*
* Overrides for Emacs so that we follow Linus's tabbing style.
* Emacs will notice this stuff at the end of the file and automatically
* adjust the settings for this buffer only. This must remain at the end
- * of the file.
+ * of the file.
* ---------------------------------------------------------------------------
* Local variables:
* c-indent-level: 8
diff --git a/linux/src/include/linux/md.h b/linux/src/include/linux/md.h
index 1c5680a..413beb7 100644
--- a/linux/src/include/linux/md.h
+++ b/linux/src/include/linux/md.h
@@ -3,15 +3,15 @@
Copyright (C) 1994-96 Marc ZYNGIER
<zyngier@ufr-info-p7.ibp.fr> or
<maz@gloups.fdn.fr>
-
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
-
+
You should have received a copy of the GNU General Public License
(for example /usr/src/linux/COPYING); if not, write to the Free
- Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifndef _MD_H
@@ -271,5 +271,5 @@ extern void md_unregister_thread (struct md_thread *thread);
extern void md_wakeup_thread(struct md_thread *thread);
extern int md_update_sb (int minor);
-#endif __KERNEL__
-#endif _MD_H
+#endif /* __KERNEL__ */
+#endif /* _MD_H */
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-10 20:31:26 +0000