diff options
| author | Borislav Petkov <bbpetkov@yahoo.de> | 2008-02-02 19:56:51 +0100 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-02-02 19:56:51 +0100 |
| commit | d59823fa44f7d9babf586b3c705db314aa0f9822 (patch) | |
| tree | 140c5f795cb97955eef25f88ae49238f3502ae8f | |
| parent | d99c9da2159fedac30b9a105a64af91dc572571b (diff) | |
| download | op-kernel-dev-d59823fa44f7d9babf586b3c705db314aa0f9822.zip op-kernel-dev-d59823fa44f7d9babf586b3c705db314aa0f9822.tar.gz | |
ide-tape: remove idetape_config_t typedef
Since this is used only in idetape_blkdev_ioctl(), remove the typedef and make
the struct function-local.
Bart:
- s/sizeof(struct idetape_config)/sizeof(config)/
Signed-off-by: Borislav Petkov <bbpetkov@yahoo.de>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
| -rw-r--r-- | drivers/ide/ide-tape.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c index 06d21bb..bf40d8c 100644 --- a/drivers/ide/ide-tape.c +++ b/drivers/ide/ide-tape.c @@ -596,15 +596,6 @@ typedef struct { #define IDETAPE_CAPABILITIES_PAGE 0x2a /* - * Run time configurable parameters. - */ -typedef struct { - int dsc_rw_frequency; - int dsc_media_access_frequency; - int nr_stages; -} idetape_config_t; - -/* * The variables below are used for the character device interface. * Additional state variables are defined in our ide_drive_t structure. */ @@ -2849,16 +2840,21 @@ static int idetape_rewind_tape (ide_drive_t *drive) static int idetape_blkdev_ioctl(ide_drive_t *drive, unsigned int cmd, unsigned long arg) { idetape_tape_t *tape = drive->driver_data; - idetape_config_t config; void __user *argp = (void __user *)arg; + struct idetape_config { + int dsc_rw_frequency; + int dsc_media_access_frequency; + int nr_stages; + } config; + #if IDETAPE_DEBUG_LOG if (tape->debug_level >= 4) printk(KERN_INFO "ide-tape: Reached idetape_blkdev_ioctl\n"); #endif /* IDETAPE_DEBUG_LOG */ switch (cmd) { case 0x0340: - if (copy_from_user(&config, argp, sizeof (idetape_config_t))) + if (copy_from_user(&config, argp, sizeof(config))) return -EFAULT; tape->best_dsc_rw_frequency = config.dsc_rw_frequency; tape->max_stages = config.nr_stages; @@ -2866,7 +2862,7 @@ static int idetape_blkdev_ioctl(ide_drive_t *drive, unsigned int cmd, unsigned l case 0x0350: config.dsc_rw_frequency = (int) tape->best_dsc_rw_frequency; config.nr_stages = tape->max_stages; - if (copy_to_user(argp, &config, sizeof (idetape_config_t))) + if (copy_to_user(argp, &config, sizeof(config))) return -EFAULT; break; default: |
