From: Sergei Shtylyov <sshtylyov@ru.mvista.com>
To: linux-scsi@vger.kernel.org, James.Bottomley@suse.de
Subject: [PATCH resend] atp870u: use pci_dev->revision
Date: Thu, 21 Jul 2011 19:35:03 +0400 [thread overview]
Message-ID: <201107211935.03428.sshtylyov@ru.mvista.com> (raw)
In-Reply-To: <201105131901.27129.sshtylyov@ru.mvista.com>
This driver uses PCI_CLASS_REVISION instead of PCI_REVISION_ID, so it wasn't
converted by commit 44c10138fd4bbc4b6d6bff0873c24902f2a9da65 (PCI: Change all
drivers to use pci_device->revision).
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
---
This patch wasn't merged in either 2.6.39 or 3.0 time, hopefully it can be
merged to 3.1 at least...
drivers/scsi/atp870u.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: linux-2.6/drivers/scsi/atp870u.c
===================================================================
--- linux-2.6.orig/drivers/scsi/atp870u.c
+++ linux-2.6/drivers/scsi/atp870u.c
@@ -2583,7 +2583,7 @@ static int atp870u_probe(struct pci_dev
* this than via the PCI device table
*/
if (ent->device == PCI_DEVICE_ID_ARTOP_AEC7610) {
- error = pci_read_config_byte(pdev, PCI_CLASS_REVISION, &atpdev->chip_ver);
+ atpdev->chip_ver = pdev->revision;
if (atpdev->chip_ver < 2)
goto err_eio;
}
@@ -2602,7 +2602,7 @@ static int atp870u_probe(struct pci_dev
base_io &= 0xfffffff8;
if ((ent->device == ATP880_DEVID1)||(ent->device == ATP880_DEVID2)) {
- error = pci_read_config_byte(pdev, PCI_CLASS_REVISION, &atpdev->chip_ver);
+ atpdev->chip_ver = pdev->revision;
pci_write_config_byte(pdev, PCI_LATENCY_TIMER, 0x80);//JCC082803
host_id = inb(base_io + 0x39);
next prev parent reply other threads:[~2011-07-21 15:36 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-13 15:01 [PATCH resend] atp870u: use pci_dev->revision Sergei Shtylyov
2011-07-21 15:35 ` Sergei Shtylyov [this message]
2011-10-05 14:56 ` Sergei Shtylyov
-- strict thread matches above, loose matches on Subject: below --
2011-02-11 19:49 Sergei Shtylyov
2011-03-24 19:51 ` 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=201107211935.03428.sshtylyov@ru.mvista.com \
--to=sshtylyov@ru.mvista.com \
--cc=James.Bottomley@suse.de \
--cc=linux-scsi@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