diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-10-03 11:09:16 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-10-03 11:09:16 +0200 |
| commit | 0d3c24e936feefeca854073ccb40613cd6eba9a9 (patch) | |
| tree | 1f675397b924846740b0931b066ddce6f3d7eb3d /drivers/parport/parport_gsc.c | |
| parent | 1af0838de60e723cb02253ecc9b555c30f8f6a6f (diff) | |
| parent | ebec44a2456fbe5fe18aae88f6010f6878f0cb4a (diff) | |
| download | talos-op-linux-0d3c24e936feefeca854073ccb40613cd6eba9a9.tar.gz talos-op-linux-0d3c24e936feefeca854073ccb40613cd6eba9a9.zip | |
Merge airlied/drm-next into drm-misc-next
Just catching up with upstream.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/parport/parport_gsc.c')
| -rw-r--r-- | drivers/parport/parport_gsc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/parport/parport_gsc.c b/drivers/parport/parport_gsc.c index 3858b87fd0bb..5f710aaaf3da 100644 --- a/drivers/parport/parport_gsc.c +++ b/drivers/parport/parport_gsc.c @@ -346,7 +346,7 @@ struct parport *parport_gsc_probe_port(unsigned long base, static int parport_count; -static int parport_init_chip(struct parisc_device *dev) +static int __init parport_init_chip(struct parisc_device *dev) { struct parport *p; unsigned long port; @@ -381,7 +381,7 @@ static int parport_init_chip(struct parisc_device *dev) return 0; } -static int parport_remove_chip(struct parisc_device *dev) +static int __exit parport_remove_chip(struct parisc_device *dev) { struct parport *p = dev_get_drvdata(&dev->dev); if (p) { @@ -403,18 +403,18 @@ static int parport_remove_chip(struct parisc_device *dev) return 0; } -static struct parisc_device_id parport_tbl[] = { +static const struct parisc_device_id parport_tbl[] __initconst = { { HPHW_FIO, HVERSION_REV_ANY_ID, HVERSION_ANY_ID, 0x74 }, { 0, } }; MODULE_DEVICE_TABLE(parisc, parport_tbl); -static struct parisc_driver parport_driver = { +static struct parisc_driver parport_driver __refdata = { .name = "Parallel", .id_table = parport_tbl, .probe = parport_init_chip, - .remove = parport_remove_chip, + .remove = __exit_p(parport_remove_chip), }; int parport_gsc_init(void) |
