diff mbox

[4/6] i2c-parport: use new parport device model

Message ID 1432135622-8288-5-git-send-email-sudipm.mukherjee@gmail.com
State Awaiting Upstream
Headers show

Commit Message

Sudip Mukherjee May 20, 2015, 3:27 p.m. UTC 
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(-)

Comments

Wolfram Sang May 20, 2015, 3:49 p.m. UTC | #1 
On Wed, May 20, 2015 at 08:57:00PM +0530, Sudip Mukherjee wrote:
> 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>
> ---

In general:

Acked-by: Wolfram Sang <wsa@the-dreams.de>

>  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,

Minor nit: I prefer to not use tabs but a single space after the struct
member names. Less hazzle in the future and still readable IMO.
Sudip Mukherjee May 20, 2015, 5:14 p.m. UTC | #2 
On Wed, May 20, 2015 at 05:49:07PM +0200, Wolfram Sang wrote:
> On Wed, May 20, 2015 at 08:57:00PM +0530, Sudip Mukherjee wrote:
> > 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>
> > ---
> 
> In general:
> 
> Acked-by: Wolfram Sang <wsa@the-dreams.de>
> 
> >  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,
> 
> Minor nit: I prefer to not use tabs but a single space after the struct
> member names. Less hazzle in the future and still readable IMO.
It was having space originally. I changed that into tab as it was
looking good with them as aligned.
I will wait today for some more review and send v2 tomorrow with this
chanage.

regards
sudip
> 


--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Wolfram Sang May 20, 2015, 5:35 p.m. UTC | #3 
> > >  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,
> > 
> > Minor nit: I prefer to not use tabs but a single space after the struct
> > member names. Less hazzle in the future and still readable IMO.
> It was having space originally. I changed that into tab as it was
> looking good with them as aligned.
> I will wait today for some more review and send v2 tomorrow with this
> chanage.

Thanks. Just to make sure: Keep it one space only, no alignment.
Jean Delvare May 20, 2015, 5:59 p.m. UTC | #4 
On Wed, 20 May 2015 22:44:52 +0530, Sudip Mukherjee wrote:
> On Wed, May 20, 2015 at 05:49:07PM +0200, Wolfram Sang wrote:
> > On Wed, May 20, 2015 at 08:57:00PM +0530, Sudip Mukherjee wrote:
> > >  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,
> > 
> > Minor nit: I prefer to not use tabs but a single space after the struct
> > member names. Less hazzle in the future and still readable IMO.
>
> It was having space originally. I changed that into tab as it was
> looking good with them as aligned.

As the driver maintainer, I am fine with both unaligned or tab-aligned.
Space-aligned as I did originally was not a good idea, I admit.
diff mbox

Patch

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 ------------------------ */