These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / auxdisplay / ks0108.c

diff --git a/kernel/drivers/auxdisplay/ks0108.c b/kernel/drivers/auxdisplay/ks0108.c
index 0d75285..816de9e 100644 (file)
--- a/kernel/drivers/auxdisplay/ks0108.c
+++ b/kernel/drivers/auxdisplay/ks0108.c
@@ -23,6 +23,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
@@ -90,17 +92,19 @@ void ks0108_displaystate(unsigned char state)
 
 void ks0108_startline(unsigned char startline)
 {
-       ks0108_writedata(min(startline,(unsigned char)63) | bit(6) | bit(7));
+       ks0108_writedata(min_t(unsigned char, startline, 63) | bit(6) |
+                        bit(7));
 }
 
 void ks0108_address(unsigned char address)
 {
-       ks0108_writedata(min(address,(unsigned char)63) | bit(6));
+       ks0108_writedata(min_t(unsigned char, address, 63) | bit(6));
 }
 
 void ks0108_page(unsigned char page)
 {
-       ks0108_writedata(min(page,(unsigned char)7) | bit(3) | bit(4) | bit(5) | bit(7));
+       ks0108_writedata(min_t(unsigned char, page, 7) | bit(3) | bit(4) |
+                        bit(5) | bit(7));
 }
 
 EXPORT_SYMBOL_GPL(ks0108_writedata);
@@ -121,53 +125,71 @@ unsigned char ks0108_isinited(void)
 }
 EXPORT_SYMBOL_GPL(ks0108_isinited);
 
-/*
- * Module Init & Exit
- */
-
-static int __init ks0108_init(void)
+static void ks0108_parport_attach(struct parport *port)
 {
-       int result;
-       int ret = -EINVAL;
-
-       ks0108_parport = parport_find_base(ks0108_port);
-       if (ks0108_parport == NULL) {
-               printk(KERN_ERR KS0108_NAME ": ERROR: "
-                       "parport didn't find %i port\n", ks0108_port);
-               goto none;
-       }
-
-       ks0108_pardevice = parport_register_device(ks0108_parport, KS0108_NAME,
-               NULL, NULL, NULL, PARPORT_DEV_EXCL, NULL);
-       parport_put_port(ks0108_parport);
-       if (ks0108_pardevice == NULL) {
-               printk(KERN_ERR KS0108_NAME ": ERROR: "
-                       "parport didn't register new device\n");
-               goto none;
+       struct pardev_cb ks0108_cb;
+
+       if (port->base != ks0108_port)
+               return;
+
+       memset(&ks0108_cb, 0, sizeof(ks0108_cb));
+       ks0108_cb.flags = PARPORT_DEV_EXCL;
+       ks0108_pardevice = parport_register_dev_model(port, KS0108_NAME,
+                                                     &ks0108_cb, 0);
+       if (!ks0108_pardevice) {
+               pr_err("ERROR: parport didn't register new device\n");
+               return;
        }
-
-       result = parport_claim(ks0108_pardevice);
-       if (result != 0) {
-               printk(KERN_ERR KS0108_NAME ": ERROR: "
-                       "can't claim %i parport, maybe in use\n", ks0108_port);
-               ret = result;
-               goto registered;
+       if (parport_claim(ks0108_pardevice)) {
+               pr_err("could not claim access to parport %i. Aborting.\n",
+                      ks0108_port);
+               goto err_unreg_device;
        }
 
+       ks0108_parport = port;
        ks0108_inited = 1;
-       return 0;
+       return;
 
-registered:
+err_unreg_device:
        parport_unregister_device(ks0108_pardevice);
-
-none:
-       return ret;
+       ks0108_pardevice = NULL;
 }
 
-static void __exit ks0108_exit(void)
+static void ks0108_parport_detach(struct parport *port)
 {
+       if (port->base != ks0108_port)
+               return;
+
+       if (!ks0108_pardevice) {
+               pr_err("%s: already unregistered.\n", KS0108_NAME);
+               return;
+       }
+
        parport_release(ks0108_pardevice);
        parport_unregister_device(ks0108_pardevice);
+       ks0108_pardevice = NULL;
+       ks0108_parport = NULL;
+}
+
+/*
+ * Module Init & Exit
+ */
+
+static struct parport_driver ks0108_parport_driver = {
+       .name = "ks0108",
+       .match_port = ks0108_parport_attach,
+       .detach = ks0108_parport_detach,
+       .devmodel = true,
+};
+
+static int __init ks0108_init(void)
+{
+       return parport_register_driver(&ks0108_parport_driver);
+}
+
+static void __exit ks0108_exit(void)
+{
+       parport_unregister_driver(&ks0108_parport_driver);
 }
 
 module_init(ks0108_init);