linux-ide.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] pata_sil680: remove duplicate pcim_enable_device
@ 2008-08-29 15:36 David Milburn
  2008-08-29 15:50 ` Alan Cox
  2008-09-08 16:16 ` Jeff Garzik
  0 siblings, 2 replies; 4+ messages in thread
From: David Milburn @ 2008-08-29 15:36 UTC (permalink / raw)
  To: jeff; +Cc: linux-ide, alan

Remove duplicate call to pcim_enable_device in sil680_init_one.

Signed-off-by: David Milburn <dmilburn@redhat.com>
---
 drivers/ata/pata_sil680.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/drivers/ata/pata_sil680.c b/drivers/ata/pata_sil680.c
index 720b864..e970b22 100644
--- a/drivers/ata/pata_sil680.c
+++ b/drivers/ata/pata_sil680.c
@@ -322,9 +322,6 @@ static int __devinit sil680_init_one(struct pci_dev *pdev,
 	/* Try to acquire MMIO resources and fallback to PIO if
 	 * that fails
 	 */
-	rc = pcim_enable_device(pdev);
-	if (rc)
-		return rc;
 	rc = pcim_iomap_regions(pdev, 1 << SIL680_MMIO_BAR, DRV_NAME);
 	if (rc)
 		goto use_ioports;

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] pata_sil680: remove duplicate pcim_enable_device
  2008-08-29 15:36 [PATCH] pata_sil680: remove duplicate pcim_enable_device David Milburn
@ 2008-08-29 15:50 ` Alan Cox
  2008-08-30 11:09   ` Tejun Heo
  2008-09-08 16:16 ` Jeff Garzik
  1 sibling, 1 reply; 4+ messages in thread
From: Alan Cox @ 2008-08-29 15:50 UTC (permalink / raw)
  To: David Milburn; +Cc: jeff, linux-ide

On Fri, 29 Aug 2008 10:36:28 -0500
David Milburn <dmilburn@redhat.com> wrote:

> Remove duplicate call to pcim_enable_device in sil680_init_one.
> 
> Signed-off-by: David Milburn <dmilburn@redhat.com>

Acked-by: Alan Cox <alan@redhat.com>

Doh.. ;)

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] pata_sil680: remove duplicate pcim_enable_device
  2008-08-29 15:50 ` Alan Cox
@ 2008-08-30 11:09   ` Tejun Heo
  0 siblings, 0 replies; 4+ messages in thread
From: Tejun Heo @ 2008-08-30 11:09 UTC (permalink / raw)
  To: Alan Cox; +Cc: David Milburn, jeff, linux-ide

Alan Cox wrote:
> On Fri, 29 Aug 2008 10:36:28 -0500
> David Milburn <dmilburn@redhat.com> wrote:
> 
>> Remove duplicate call to pcim_enable_device in sil680_init_one.
>>
>> Signed-off-by: David Milburn <dmilburn@redhat.com>
> 
> Acked-by: Alan Cox <alan@redhat.com>
> 
> Doh.. ;)

Doh... was that me?  Going through the log... Yay, it was me in the
commit f08048e94564d009b19038cfbdd800aa83e79c7f.  Lucky me.  I was
supposed to move enabling above but apparently forgot to killing the
original one.  Heh... anyways.  Thanks for spotting this.

Embarrassingly-Acked-by: Tejun Heo <tj@kernel.org>

-- 
tejun

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] pata_sil680: remove duplicate pcim_enable_device
  2008-08-29 15:36 [PATCH] pata_sil680: remove duplicate pcim_enable_device David Milburn
  2008-08-29 15:50 ` Alan Cox
@ 2008-09-08 16:16 ` Jeff Garzik
  1 sibling, 0 replies; 4+ messages in thread
From: Jeff Garzik @ 2008-09-08 16:16 UTC (permalink / raw)
  To: David Milburn; +Cc: linux-ide, alan

David Milburn wrote:
> Remove duplicate call to pcim_enable_device in sil680_init_one.
> 
> Signed-off-by: David Milburn <dmilburn@redhat.com>
> ---
>  drivers/ata/pata_sil680.c |    3 ---
>  1 files changed, 0 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/ata/pata_sil680.c b/drivers/ata/pata_sil680.c
> index 720b864..e970b22 100644
> --- a/drivers/ata/pata_sil680.c
> +++ b/drivers/ata/pata_sil680.c
> @@ -322,9 +322,6 @@ static int __devinit sil680_init_one(struct pci_dev *pdev,
>  	/* Try to acquire MMIO resources and fallback to PIO if
>  	 * that fails
>  	 */
> -	rc = pcim_enable_device(pdev);
> -	if (rc)
> -		return rc;
>  	rc = pcim_iomap_regions(pdev, 1 << SIL680_MMIO_BAR, DRV_NAME);
>  	if (rc)
>  		goto use_ioports;

applied



^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2008-09-08 16:16 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-08-29 15:36 [PATCH] pata_sil680: remove duplicate pcim_enable_device David Milburn
2008-08-29 15:50 ` Alan Cox
2008-08-30 11:09   ` Tejun Heo
2008-09-08 16:16 ` Jeff Garzik

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).