From: Jiri Slaby <jirislaby@gmail.com>
To: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Cc: Andrew Morton <akpm@osdl.org>,
Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>,
linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org,
Alan Cox <alan@lxorguk.ukuu.org.uk>
Subject: Re: [PATCH] HPT3xx: switch to using pci_get_slot()
Date: Sun, 28 May 2006 15:50:25 +0159 [thread overview]
Message-ID: <4479AAB8.9010509@gmail.com> (raw)
In-Reply-To: <4478E104.7040200@ru.mvista.com>
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Sergei Shtylyov napsal(a):
> Switch to using pci_get_slot() to get to the function 1 of HPT36x/374
> chips -- there's no need for the driver itself to walk the list of the
> PCI devices, and it also forgets to check the bus number of the device
> found.
It's better, but you missed to call pci_dev_put() in some __exit function.
>
> Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
>
>
> ------------------------------------------------------------------------
>
> Index: linus/drivers/ide/pci/hpt366.c
> ===================================================================
> --- linus.orig/drivers/ide/pci/hpt366.c
> +++ linus/drivers/ide/pci/hpt366.c
> @@ -1,5 +1,5 @@
> /*
> - * linux/drivers/ide/pci/hpt366.c Version 0.44 May 20, 2006
> + * linux/drivers/ide/pci/hpt366.c Version 0.45 May 27, 2006
> *
> * Copyright (C) 1999-2003 Andre Hedrick <andre@linux-ide.org>
> * Portions Copyright (C) 2001 Sun Microsystems, Inc.
> @@ -79,6 +79,7 @@
> * - prefix the driver startup messages with the real chip name
> * - claim the extra 240 bytes of I/O space for all chips
> * - optimize the rate masking/filtering and the drive list lookup code
> + * - use pci_get_slot() to get to the function 1 of HPT36x/374
> * <source@mvista.com>
> *
> */
> @@ -1412,24 +1413,24 @@ static void __devinit init_iops_hpt366(i
>
> static int __devinit init_setup_hpt374(struct pci_dev *dev, ide_pci_device_t *d)
> {
> - struct pci_dev *findev = NULL;
> + struct pci_dev *dev2;
>
> if (PCI_FUNC(dev->devfn) & 1)
> return -ENODEV;
>
> - while ((findev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, findev)) != NULL) {
> - if ((findev->vendor == dev->vendor) &&
> - (findev->device == dev->device) &&
> - ((findev->devfn - dev->devfn) == 1) &&
> - (PCI_FUNC(findev->devfn) & 1)) {
> - if (findev->irq != dev->irq) {
> - /* FIXME: we need a core pci_set_interrupt() */
> - findev->irq = dev->irq;
> - printk(KERN_WARNING "%s: pci-config space interrupt "
> - "fixed.\n", d->name);
> - }
> - return ide_setup_pci_devices(dev, findev, d);
> + if ((dev2 = pci_get_slot(dev->bus, dev->devfn + 1)) != NULL) {
> + int ret;
> +
> + if (dev2->irq != dev->irq) {
> + /* FIXME: we need a core pci_set_interrupt() */
> + dev2->irq = dev->irq;
> + printk(KERN_WARNING "%s: PCI config space interrupt "
> + "fixed.\n", d->name);
> }
> + ret = ide_setup_pci_devices(dev, dev2, d);
> + if (ret < 0)
> + pci_dev_put(dev2);
> + return ret;
> }
> return ide_setup_pci_device(dev, d);
> }
> @@ -1487,8 +1488,8 @@ static int __devinit init_setup_hpt302(s
>
> static int __devinit init_setup_hpt366(struct pci_dev *dev, ide_pci_device_t *d)
> {
> - struct pci_dev *findev = NULL;
> - u8 rev = 0, pin1 = 0, pin2 = 0;
> + struct pci_dev *dev2;
> + u8 rev = 0;
> static char *chipset_names[] = { "HPT366", "HPT366", "HPT368",
> "HPT370", "HPT370A", "HPT372",
> "HPT372N" };
> @@ -1508,21 +1509,21 @@ static int __devinit init_setup_hpt366(s
>
> d->channels = 1;
>
> - pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin1);
> - while ((findev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, findev)) != NULL) {
> - if ((findev->vendor == dev->vendor) &&
> - (findev->device == dev->device) &&
> - ((findev->devfn - dev->devfn) == 1) &&
> - (PCI_FUNC(findev->devfn) & 1)) {
> - pci_read_config_byte(findev, PCI_INTERRUPT_PIN, &pin2);
> - if ((pin1 != pin2) && (dev->irq == findev->irq)) {
> - d->bootable = ON_BOARD;
> - printk("%s: onboard version of chipset, "
> - "pin1=%d pin2=%d\n", d->name,
> - pin1, pin2);
> - }
> - return ide_setup_pci_devices(dev, findev, d);
> + if ((dev2 = pci_get_slot(dev->bus, dev->devfn + 1)) != NULL) {
> + u8 pin1 = 0, pin2 = 0;
> + int ret;
> +
> + pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin1);
> + pci_read_config_byte(dev2, PCI_INTERRUPT_PIN, &pin2);
> + if (pin1 != pin2 && dev->irq == dev2->irq) {
> + d->bootable = ON_BOARD;
> + printk("%s: onboard version of chipset, pin1=%d pin2=%d\n",
> + d->name, pin1, pin2);
> }
> + ret = ide_setup_pci_devices(dev, dev2, d);
> + if (ret < 0)
> + pci_dev_put(dev2);
> + return ret;
> }
> init_single:
> return ide_setup_pci_device(dev, d);
>
- --
Jiri Slaby www.fi.muni.cz/~xslaby
\_.-^-._ jirislaby@gmail.com _.-^-._/
B67499670407CE62ACC8 22A032CC55C339D47A7E
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org
iD8DBQFEeaq4MsxVwznUen4RAgeRAKDFZZWKIOW1kEOOnsMPRmsNBGc0AQCfWM1f
v7Ub4sGcHL0nCGJ6dhoj4g0=
=e7BC
-----END PGP SIGNATURE-----
next prev parent reply other threads:[~2006-05-28 13:50 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-04-23 8:33 [PATCH][RFT] HPT3xxN clocking fixes Sergei Shtylyov
2006-04-24 22:09 ` [PATCH][RFT] HPT3xxN clocking fixes (take 2) Sergei Shtylyov
2006-05-02 21:55 ` [PATCH][RFT] Fix HPT37x timing tables Sergei Shtylyov
2006-05-06 20:08 ` [PATCH] Optimize " Sergei Shtylyov
2006-05-02 22:14 ` [PATCH][RFT] Fix HPT3xx hotswap support Sergei Shtylyov
2006-05-02 22:26 ` [PATCH] Fix the case of multiple HPT3xx chips present Sergei Shtylyov
2006-05-04 19:46 ` [PATCH] HPT3xx: fix PCI clock detection Sergei Shtylyov
2006-05-16 22:44 ` [PATCH] HPT3xx: rework rate filtering Sergei Shtylyov
2006-05-20 8:51 ` [PATCH] HPT3xx: print the real chip name at startup Sergei Shtylyov
2006-05-27 22:05 ` [PATCH] HPT3xx: switch to using pci_find_slot() Sergei Shtylyov
2006-05-27 22:54 ` Jiri Slaby
2006-05-27 23:01 ` Sergei Shtylyov
2006-05-27 23:30 ` [PATCH] HPT3xx: switch to using pci_get_slot() Sergei Shtylyov
2006-05-28 2:55 ` [PATCH] HPT3xx: cache channel's MCR address Sergei Shtylyov
2006-06-04 22:24 ` [PATCH] HPT3x7: merge speedproc handlers Sergei Shtylyov
2006-06-11 21:18 ` [PATCH] HPT370: clean up DMA timeout handling Sergei Shtylyov
2006-06-27 21:41 ` [PATCH][RFT] HPT3xx: init code rewrite Sergei Shtylyov
2006-05-28 13:51 ` Jiri Slaby [this message]
2006-05-29 14:26 ` [PATCH] HPT3xx: switch to using pci_get_slot() Sergei Shtylyov
2006-05-20 8:41 ` [PATCH] HPT37x: read f_CNT saved by BIOS from port Sergei Shtylyov
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=4479AAB8.9010509@gmail.com \
--to=jirislaby@gmail.com \
--cc=akpm@osdl.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=bzolnier@gmail.com \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sshtylyov@ru.mvista.com \
/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).