linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
To: Tim Waugh <tim@cyberelk.net>, Jean Delvare <jdelvare@suse.de>,
	Wolfram Sang <wsa@the-dreams.de>,
	Willy Tarreau <willy@meta-x.org>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Alan Cox <gnomes@lxorguk.ukuu.org.uk>
Cc: linux-kernel@vger.kernel.org, linux-i2c@vger.kernel.org,
	devel@driverdev.osuosl.org,
	Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Subject: [PATCH 4/6] i2c-parport: use new parport device model
Date: Wed, 20 May 2015 20:57:00 +0530	[thread overview]
Message-ID: <1432135622-8288-5-git-send-email-sudipm.mukherjee@gmail.com> (raw)
In-Reply-To: <1432135622-8288-1-git-send-email-sudipm.mukherjee@gmail.com>

Modify i2c-parport driver to use the new parallel port device model.

Tested-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
---

i2c_parport_cb is made local, devmodel added to driver structure,
and probe removed.	       

 drivers/i2c/busses/i2c-parport.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/drivers/i2c/busses/i2c-parport.c b/drivers/i2c/busses/i2c-parport.c
index 155da95..138347e 100644
--- a/drivers/i2c/busses/i2c-parport.c
+++ b/drivers/i2c/busses/i2c-parport.c
@@ -185,11 +185,15 @@ static void i2c_parport_attach(struct parport *port)
 		printk(KERN_ERR "i2c-parport: Failed to kzalloc\n");
 		return;
 	}
+	memset(&i2c_parport_cb, 0, sizeof(i2c_parport_cb));
+	i2c_parport_cb.flags = PARPORT_FLAG_EXCL;
+	i2c_parport_cb.irq_func = i2c_parport_irq;
+	i2c_parport_cb.private = adapter;
 
 	pr_debug("i2c-parport: attaching to %s\n", port->name);
 	parport_disable_irq(port);
-	adapter->pdev = parport_register_device(port, "i2c-parport",
-		NULL, NULL, i2c_parport_irq, PARPORT_FLAG_EXCL, adapter);
+	adapter->pdev = parport_register_dev_model(port, "i2c-parport",
+						   &i2c_parport_cb, i);
 	if (!adapter->pdev) {
 		printk(KERN_ERR "i2c-parport: Unable to register with parport\n");
 		goto err_free;
@@ -283,9 +287,10 @@ static void i2c_parport_detach(struct parport *port)
 }
 
 static struct parport_driver i2c_parport_driver = {
-	.name	= "i2c-parport",
-	.attach	= i2c_parport_attach,
-	.detach	= i2c_parport_detach,
+	.name		= "i2c-parport",
+	.match_port	= i2c_parport_attach,
+	.detach		= i2c_parport_detach,
+	.devmodel	= true,
 };
 
 /* ----- Module loading, unloading and information ------------------------ */
-- 
1.8.1.2


  parent reply	other threads:[~2015-05-20 15:27 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-20 15:26 [PATCH 0/6] use devicemodel with parport Sudip Mukherjee
2015-05-20 15:26 ` [PATCH 1/6] parport: add device-model to parport subsystem Sudip Mukherjee
2015-05-20 15:26 ` [PATCH 2/6] staging: panel: use new parport device model Sudip Mukherjee
2015-05-20 15:26 ` [PATCH 3/6] i2c-parport: define ports to connect Sudip Mukherjee
2015-05-20 15:46   ` Wolfram Sang
2015-05-20 15:27 ` Sudip Mukherjee [this message]
2015-05-20 15:49   ` [PATCH 4/6] i2c-parport: use new parport device model Wolfram Sang
2015-05-20 17:14     ` Sudip Mukherjee
2015-05-20 17:35       ` Wolfram Sang
2015-05-20 17:59       ` Jean Delvare
2015-05-21  1:02         ` [RFC PATCH] checkpatch: check for 2 or more spaces around assignment of a declaration Joe Perches
2015-05-21  5:48           ` Willy Tarreau
2015-05-21  6:16   ` [PATCH v2 4/6] i2c-parport: use new parport device model Sudip Mukherjee
2015-05-20 15:27 ` [PATCH 5/6] paride: " Sudip Mukherjee
2015-05-20 15:27 ` [PATCH 6/6] MAINTAINERS: maintain parport Sudip Mukherjee
2015-05-20 15:46   ` Richard Weinberger
2015-05-20 16:28     ` Joe Perches
2015-05-20 17:31       ` Sudip Mukherjee
2015-05-20 16:33     ` One Thousand Gnomes
2015-05-20 20:36       ` Richard Weinberger
2015-05-21  5:59         ` Sudip Mukherjee
2015-05-21  5:51     ` Willy Tarreau
2015-05-21  6:09       ` Greg Kroah-Hartman
2015-05-31 22:05 ` [PATCH 0/6] use devicemodel with parport Greg Kroah-Hartman
2015-06-01  5:46   ` Sudip Mukherjee
2015-06-01  6:18     ` Greg Kroah-Hartman
2015-06-01  8:34       ` Sudip Mukherjee

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1432135622-8288-5-git-send-email-sudipm.mukherjee@gmail.com \
    --to=sudipm.mukherjee@gmail.com \
    --cc=devel@driverdev.osuosl.org \
    --cc=gnomes@lxorguk.ukuu.org.uk \
    --cc=gregkh@linuxfoundation.org \
    --cc=jdelvare@suse.de \
    --cc=linux-i2c@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=tim@cyberelk.net \
    --cc=willy@meta-x.org \
    --cc=wsa@the-dreams.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).