diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-05 09:37:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-05 09:37:11 -0700 |
| commit | f32c9e059eb6c12a4296003489b167f8eef9d201 (patch) | |
| tree | 77832660127a7a015aa6c4a06e606313ce5fb329 /drivers/scsi | |
| parent | d1ce495676644fc79b3ccd58657133c5d4a414fb (diff) | |
| parent | fd46cd55fbc5a8e8c180ee04a30cda26c84569d2 (diff) | |
Merge branch 'parisc-4.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc updates from Helge Deller:
"Major changes include:
- Full support of the firmware Page Deallocation Table with
MADV_HWPOISON and MADV_SOFT_OFFLINE. A kernel thread scans
regularily for new bad memory pages.
- Full support for self-extracting kernel.
- Added UBSAN support.
- Lots of section mismatch fixes across all parisc drivers.
- Added examples for %pF and %pS usage in printk-formats.txt"
* 'parisc-4.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux: (28 commits)
printk-formats.txt: Add examples for %pF and %pS usage
parisc: Fix up devices below a PCI-PCI MegaRAID controller bridge
parisc/core: Fix section mismatches
parisc/ipmi_si_intf: Fix section mismatches on parisc platform
parisc/input/hilkbd: Fix section mismatches
parisc/net/lasi_82596: Fix section mismatches
parisc/serio: Fix section mismatches in gscps2 and hp_sdc drivers
parisc: Fix section mismatches in parisc core drivers
parisc/parport_gsc: Fix section mismatches
parisc/scsi/lasi700: Fix section mismatches
parisc/scsi/zalon: Fix section mismatches
parisc/8250_gsc: Fix section mismatches
parisc/mux: Fix section mismatches
parisc/sticore: Fix section mismatches
parisc/harmony: Fix section mismatches
parisc: Wire up support for self-extracting kernel
parisc: Make existing core files reuseable for bootloader
parisc: Add core code for self-extracting kernel
parisc: Enable UBSAN support
parisc/random: Add machine specific randomness
...
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/lasi700.c | 6 | ||||
| -rw-r--r-- | drivers/scsi/zalon.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/drivers/scsi/lasi700.c b/drivers/scsi/lasi700.c index 5c4ded997265..dc839279bbd9 100644 --- a/drivers/scsi/lasi700.c +++ b/drivers/scsi/lasi700.c @@ -81,7 +81,7 @@ MODULE_LICENSE("GPL"); #define LASI710_CLOCK 40 #define LASI_SCSI_CORE_OFFSET 0x100 -static struct parisc_device_id lasi700_ids[] = { +static const struct parisc_device_id lasi700_ids[] __initconst = { LASI700_ID_TABLE, LASI710_ID_TABLE, { 0 } @@ -164,11 +164,11 @@ lasi700_driver_remove(struct parisc_device *dev) return 0; } -static struct parisc_driver lasi700_driver = { +static struct parisc_driver lasi700_driver __refdata = { .name = "lasi_scsi", .id_table = lasi700_ids, .probe = lasi700_probe, - .remove = lasi700_driver_remove, + .remove = __exit_p(lasi700_driver_remove), }; static int __init diff --git a/drivers/scsi/zalon.c b/drivers/scsi/zalon.c index b2cf1faa819d..4722660958f8 100644 --- a/drivers/scsi/zalon.c +++ b/drivers/scsi/zalon.c @@ -160,14 +160,14 @@ zalon_probe(struct parisc_device *dev) return error; } -static struct parisc_device_id zalon_tbl[] = { +static const struct parisc_device_id zalon_tbl[] __initconst = { { HPHW_A_DMA, HVERSION_REV_ANY_ID, HVERSION_ANY_ID, 0x00089 }, { 0, } }; MODULE_DEVICE_TABLE(parisc, zalon_tbl); -static int zalon_remove(struct parisc_device *dev) +static int __exit zalon_remove(struct parisc_device *dev) { struct Scsi_Host *host = dev_get_drvdata(&dev->dev); @@ -178,11 +178,11 @@ static int zalon_remove(struct parisc_device *dev) return 0; } -static struct parisc_driver zalon_driver = { +static struct parisc_driver zalon_driver __refdata = { .name = "zalon", .id_table = zalon_tbl, .probe = zalon_probe, - .remove = zalon_remove, + .remove = __exit_p(zalon_remove), }; static int __init zalon7xx_init(void) |