From: Jeff Garzik <jgarzik@mandrakesoft.com>
To: Marcus Meissner <Marcus.Meissner@caldera.de>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] es1371 pci fix/cleanup
Date: Mon, 23 Apr 2001 11:58:25 -0400 [thread overview]
Message-ID: <3AE45121.926C4B51@mandrakesoft.com> (raw)
In-Reply-To: <20010423175158.A15604@caldera.de>
Marcus Meissner wrote:
>
> Hi,
>
> This moves pci_enable_device in the es1371 driver before any resource
> access and also replaces the RSRCISIOREGION by just pci_resource_flags
> as suggested by Jeff.
>
> Tested and verified.
>
> Ciao, Marcus
>
> Index: drivers/sound/es1371.c
> ===================================================================
> RCS file: /build/mm/work/repository/linux-mm/drivers/sound/es1371.c,v
> retrieving revision 1.7
> diff -u -r1.7 es1371.c
> --- drivers/sound/es1371.c 2001/04/17 17:26:05 1.7
> +++ drivers/sound/es1371.c 2001/04/23 15:49:15
> @@ -2771,9 +2771,6 @@
> { SOUND_MIXER_WRITE_IGAIN, 0x4040 }
> };
>
> -#define RSRCISIOREGION(dev,num) (pci_resource_start((dev), (num)) != 0 && \
> - (pci_resource_flags((dev), (num)) & IORESOURCE_IO))
> -
> static int __devinit es1371_probe(struct pci_dev *pcidev, const struct pci_device_id *pciid)
> {
> struct es1371_state *s;
> @@ -2783,8 +2780,11 @@
> signed long tmo2;
> unsigned int cssr;
>
> - if (!RSRCISIOREGION(pcidev, 0))
> + if (pci_enable_device(pcidev))
> return -1;
> +
> + if (!(pci_resource_flags(pcidev, 0) & IORESOURCE_IO))
> + return -1;
> if (pcidev->irq == 0)
> return -1;
Looks ok except error returns.
pci_enable_device - obtain its return value, and return that.
no IORESOURCE_IO or pcidev->irq==0 - I guess -ENODEV would be
appropriate. (basically look at errno.h and make a judgement call which
error best fits the situation)
--
Jeff Garzik | The difference between America and England is that
Building 1024 | the English think 100 miles is a long distance and
MandrakeSoft | the Americans think 100 years is a long time.
| (random fortune)
next prev parent reply other threads:[~2001-04-23 15:58 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2001-04-23 15:51 [PATCH] es1371 pci fix/cleanup Marcus Meissner
2001-04-23 15:58 ` Jeff Garzik [this message]
2001-04-23 16:06 ` Marcus Meissner
2001-04-23 16:11 ` Jeff Garzik
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=3AE45121.926C4B51@mandrakesoft.com \
--to=jgarzik@mandrakesoft.com \
--cc=Marcus.Meissner@caldera.de \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=linux-kernel@vger.kernel.org \
/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