diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-30 07:39:10 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-30 07:39:10 -0800 |
commit | 5e237e8c77279a0873a5e9806a5459ebc840c9ce (patch) | |
tree | f2fc8f3d2fefe719cd187909a164edca5c02c39c /include | |
parent | 9ca4c6429f92598a84e4c3292ea7d187c9d7b033 (diff) | |
parent | 2fd3c5c617937cde5aafa48db4f4056e1f705987 (diff) | |
download | linux-5e237e8c77279a0873a5e9806a5459ebc840c9ce.tar.bz2 |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
Pull IDE updates from David Miller:
1) Fix mem region name in tx4949ide driver, from Christophe JAILLET.
2) Make drive->dn read only, it should not be changeable by users. From
Dan Carpenter.
3) Several cast fixups from Krzysztof Kozlowski.
There is also going to be a removal of a now unused IDE driver, but that
will come via the MIPS tree.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
ide: make drive->dn read only
ide: serverworks: potential overflow in svwks_set_pio_mode()
cmd64x: potential buffer overflow in cmd64x_program_timings()
ide: remove unneeded header include path to drivers/ide
ide: qd65xx: Fix cast to pointer from integer of different size
ide: ht6560b: Fix cast to pointer from integer of different size
ide: remove set but not used variable 'hwif'
ide: remove unnecessary touch_softlockup_watchdog
ide: tx4939ide: Fix the name used in a 'devm_request_mem_region()' call
ide: Use dev_get_drvdata where possible
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/ide.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index 06dae6438557..a254841bd315 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -945,6 +945,10 @@ ide_devset_get(_name, _field); \ ide_devset_set(_name, _field); \ IDE_DEVSET(_name, DS_SYNC, get_##_name, set_##_name) +#define ide_devset_ro_field(_name, _field) \ +ide_devset_get(_name, _field); \ +IDE_DEVSET(_name, 0, get_##_name, NULL) + #define ide_devset_rw_flag(_name, _field) \ ide_devset_get_flag(_name, _field); \ ide_devset_set_flag(_name, _field); \ |