diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-10-10 16:39:27 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-10-10 16:39:27 -0400 |
commit | 263138a0ad6e38de7f6526b7de037ed4511308ef (patch) | |
tree | 1da68f098b378ddf2381c2012d700c897c6681ee /drivers/ide/ide.c | |
parent | 1e874f448365b80e69b8a60b8b575b17f00811f3 (diff) |
ide: preparations for /proc/ide/hd*/settings rework
After rework settings will be no longer created dynamically
for each device so we need to make some fixups first.
* Use set_[ksettings,unmaskirq]() as a set function for
["keepsettings","unmaskirq"] setting.
* Allow writes to ["io_32bit","unmaskirq"] settings also when
drive->no_[io_32bit,unmask] is set (this is checked later inside
set_[io_32bit,unmaskirq]() anywyay and keeps consistency with
the corresponding HDIO_SET_[32BIT,UNMASKINTR] ioctls).
* Use max possible multi sectors value (16) as an allowed max for
"multcount" setting. set_multcount() set function checks against
device's max possbile value anyway and it makes the proc setting
consistent with the corresponding HDIO_SET_MULTCOUNT ioctl.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide.c')
-rw-r--r-- | drivers/ide/ide.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c index 080314e3d6b7..8e0c9f27ae4a 100644 --- a/drivers/ide/ide.c +++ b/drivers/ide/ide.c | |||
@@ -305,7 +305,7 @@ int set_io_32bit(ide_drive_t *drive, int arg) | |||
305 | return 0; | 305 | return 0; |
306 | } | 306 | } |
307 | 307 | ||
308 | static int set_ksettings(ide_drive_t *drive, int arg) | 308 | int set_ksettings(ide_drive_t *drive, int arg) |
309 | { | 309 | { |
310 | if (arg < 0 || arg > 1) | 310 | if (arg < 0 || arg > 1) |
311 | return -EINVAL; | 311 | return -EINVAL; |
@@ -394,7 +394,7 @@ int set_pio_mode(ide_drive_t *drive, int arg) | |||
394 | return 0; | 394 | return 0; |
395 | } | 395 | } |
396 | 396 | ||
397 | static int set_unmaskirq(ide_drive_t *drive, int arg) | 397 | int set_unmaskirq(ide_drive_t *drive, int arg) |
398 | { | 398 | { |
399 | if (drive->no_unmask) | 399 | if (drive->no_unmask) |
400 | return -EPERM; | 400 | return -EPERM; |