[PATCH v5 WIP 2/5] staging: panel: use new parport device model

[Sudip Mukherjee]

converted to use the new device-model parallel port.

Signed-off-by: Sudip Mukherjee <sudip@xxxxxxxxxxxxxxx>
---
 drivers/staging/panel/panel.c | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/panel/panel.c b/drivers/staging/panel/panel.c
index 1d8ed8b..772a82a 100644
--- a/drivers/staging/panel/panel.c
+++ b/drivers/staging/panel/panel.c
@@ -2188,6 +2188,18 @@ static struct notifier_block panel_notifier = {
 	0
 };
 
+static int panel_probe(struct pardevice *par_dev)
+{
+	if (strcmp(par_dev->name, "panel"))
+		return -ENODEV;
+	return 0;
+}
+
+struct pardev_cb panel_cb = {
+	.flags = 0,     /*PARPORT_DEV_EXCL */
+	.private = &pprt,
+};
+
 static void panel_attach(struct parport *port)
 {
 	if (port->number != parport)
@@ -2199,10 +2211,7 @@ static void panel_attach(struct parport *port)
 		return;
 	}
 
-	pprt = parport_register_device(port, "panel", NULL, NULL,  /* pf, kf */
-				       NULL,
-				       /*PARPORT_DEV_EXCL */
-				       0, (void *)&pprt);
+	pprt = parport_register_dev_model(port, "panel", &panel_cb, 0);
 	if (pprt == NULL) {
 		pr_err("%s: port->number=%d parport=%d, parport_register_device() failed\n",
 		       __func__, port->number, parport);
@@ -2256,8 +2265,9 @@ static void panel_detach(struct parport *port)
 
 static struct parport_driver panel_driver = {
 	.name = "panel",
-	.attach = panel_attach,
+	.match_port = panel_attach,
 	.detach = panel_detach,
+	.probe = panel_probe,
 };
 
 /* init function */
-- 
1.8.1.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/