[PATCH 1/2] staging/comedi: Add pci_driver.name to skel driver

[PATCH 1/2] staging/comedi: Add pci_driver.name to skel driver

[Peter Huewe]

This patch adds the comedi_driver.name to pci_driver.name
to the skel driver, so we can remove the workaround in drivers.c

Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
---
 drivers/staging/comedi/drivers/skel.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/staging/comedi/drivers/skel.c b/drivers/staging/comedi/drivers/skel.c
index e2d7970..4a40498 100644
--- a/drivers/staging/comedi/drivers/skel.c
+++ b/drivers/staging/comedi/drivers/skel.c
@@ -713,6 +713,7 @@ static void skel_pci_remove(struct pci_dev *dev)
 }
 
 static struct pci_driver skel_pci_driver = {
+	.name = "dummy"
 	.id_table = skel_pci_table,
 	.probe = &skel_pci_probe,
 	.remove = &skel_pci_remove
-- 
1.7.8.6

[PATCH 2/2] staging/comedi: remove workaround for !pci_driver.name

[Peter Huewe]

All pci drivers in drivers/ have the pci_driver.name field set, so we
can remove this workaround and the accompanying todo.

Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
---
 drivers/staging/comedi/drivers.c |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c
index 8b681ac..cebdd9e 100644
--- a/drivers/staging/comedi/drivers.c
+++ b/drivers/staging/comedi/drivers.c
@@ -536,10 +536,6 @@ int comedi_pci_driver_register(struct comedi_driver *comedi_driver,
 	if (ret < 0)
 		return ret;
 
-	/* FIXME: Remove this test after auditing all comedi pci drivers */
-	if (!pci_driver->name)
-		pci_driver->name = comedi_driver->driver_name;
-
 	ret = pci_register_driver(pci_driver);
 	if (ret < 0) {
 		comedi_driver_unregister(comedi_driver);
-- 
1.7.8.6

RE: [PATCH 1/2] staging/comedi: Add pci_driver.name to skel driver

[H Hartley Sweeten]

On Monday, January 21, 2013 1:52 PM, Peter Huewe wrote:
> This patch adds the comedi_driver.name to pci_driver.name
> to the skel driver, so we can remove the workaround in drivers.c
>
> Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
> ---
>  drivers/staging/comedi/drivers/skel.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/staging/comedi/drivers/skel.c b/drivers/staging/comedi/drivers/skel.c
> index e2d7970..4a40498 100644
> --- a/drivers/staging/comedi/drivers/skel.c
> +++ b/drivers/staging/comedi/drivers/skel.c
> @@ -713,6 +713,7 @@ static void skel_pci_remove(struct pci_dev *dev)
>  }
>  
>  static struct pci_driver skel_pci_driver = {
> +	.name = "dummy"
>  	.id_table = skel_pci_table,
>  	.probe = &skel_pci_probe,
>  	.remove = &skel_pci_remove

Hmm... I was just about to post a rebase of the last part of my drivers.c
cleanup that included this and your 2/2 patch.

Oh well... Rebase again...

FWIW, for both patches.

Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>

RE: [PATCH 1/2] staging/comedi: Add pci_driver.name to skel driver

[H Hartley Sweeten]

On Monday, January 21, 2013 1:52 PM, Peter Huewe wrote:
> This patch adds the comedi_driver.name to pci_driver.name
> to the skel driver, so we can remove the workaround in drivers.c
>
> Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
> ---
>  drivers/staging/comedi/drivers/skel.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/staging/comedi/drivers/skel.c b/drivers/staging/comedi/drivers/skel.c
> index e2d7970..4a40498 100644
> --- a/drivers/staging/comedi/drivers/skel.c
> +++ b/drivers/staging/comedi/drivers/skel.c
> @@ -713,6 +713,7 @@ static void skel_pci_remove(struct pci_dev *dev)
>  }
>  
>  static struct pci_driver skel_pci_driver = {
> +	.name = "dummy"

Peter,

Missing comma at the end. Did you build this?

Hartley

[PATCH v2] staging/comedi: Add pci_driver.name to skel driver

[Peter Huewe]

This patch adds the comedi_driver.name to pci_driver.name
to the skel driver, so we can remove the workaround in drivers.c

Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
---
missed a comma, sorry
 drivers/staging/comedi/drivers/skel.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/staging/comedi/drivers/skel.c b/drivers/staging/comedi/drivers/skel.c
index e2d7970..48178ca 100644
--- a/drivers/staging/comedi/drivers/skel.c
+++ b/drivers/staging/comedi/drivers/skel.c
@@ -713,6 +713,7 @@ static void skel_pci_remove(struct pci_dev *dev)
 }
 
 static struct pci_driver skel_pci_driver = {
+	.name = "dummy",
 	.id_table = skel_pci_table,
 	.probe = &skel_pci_probe,
 	.remove = &skel_pci_remove
-- 
1.7.8.6

RE: [PATCH 1/2] staging/comedi: Add pci_driver.name to skel driver

[H Hartley Sweeten]

On Monday, January 21, 2013 2:25 PM, Peter Hüwe wrote:
>
> It's okay to drop my patches so you don't have to rebase.
>
>  (I posted a version with the missing comma nevertheless)

Peter,

Your updated versions are ok. I'm about done with the rebase anyway.
Please make sure to at least compile test your patches before posting
in the future.

Greg,

These two patches need to be applied before my cleanup series for
the comedi drivers.c file. I'll be posting them shortly.

Thanks,
Hartley

Re: [PATCH 1/2] staging/comedi: Add pci_driver.name to skel driver

[Peter Hüwe]

Am Montag, 21. Januar 2013, 21:56:22 schrieb H Hartley Sweeten:
> On Monday, January 21, 2013 1:52 PM, Peter Huewe wrote:
> > This patch adds the comedi_driver.name to pci_driver.name
> > to the skel driver, so we can remove the workaround in drivers.c
> > 
> > Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
> > ---
> > 
> >  drivers/staging/comedi/drivers/skel.c |    1 +
> >  1 files changed, 1 insertions(+), 0 deletions(-)
> > 
> > diff --git a/drivers/staging/comedi/drivers/skel.c
> > b/drivers/staging/comedi/drivers/skel.c index e2d7970..4a40498 100644
> > --- a/drivers/staging/comedi/drivers/skel.c
> > +++ b/drivers/staging/comedi/drivers/skel.c
> > @@ -713,6 +713,7 @@ static void skel_pci_remove(struct pci_dev *dev)
> > 
> >  }
> >  
> >  static struct pci_driver skel_pci_driver = {
> > 
> > +	.name = "dummy"
> > 
> >  	.id_table = skel_pci_table,
> >  	.probe = &skel_pci_probe,
> >  	.remove = &skel_pci_remove
> 
> Hmm... I was just about to post a rebase of the last part of my drivers.c
> cleanup that included this and your 2/2 patch.
> 
> Oh well... Rebase again...
> 
> FWIW, for both patches.
> 
> Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>

It's okay to drop my patches so you don't have to rebase.

(I posted a version with the missing comma nevertheless)


Thanks,
Peter