From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932275AbcDGSwi (ORCPT ); Thu, 7 Apr 2016 14:52:38 -0400 Received: from emh04.mail.saunalahti.fi ([62.142.5.110]:53363 "EHLO emh04.mail.saunalahti.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932078AbcDGSwh (ORCPT ); Thu, 7 Apr 2016 14:52:37 -0400 From: Leonid Moiseichuk To: jejb@linux.vnet.ibm.com, yuxiangl@marvell.com Cc: Wilfried.Weissmann@gmx.at, dan.j.williams@intel.com, andy.shevchenko@gmail.com, linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, Leonid Moiseichuk Subject: [PATCH v3] mvsas: Generalize Marvell 9485 in pci_device_id Date: Thu, 7 Apr 2016 21:52:25 +0300 Message-Id: <1460055145-30467-1-git-send-email-leonid.moiseichuk@gmail.com> X-Mailer: git-send-email 2.8.0.rc3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org For generic subvendor has sense to use generic subdevice. If subdevice ID not equal to 0x9480/0x9485 mvsas will be not activated. Tested on ASUS P9A-I/C2550/SAS/4L which uses vendor-specific 1043:8635. v3: add comment and changelog according to Andy's findings v2: re-phrased commit message Signed-off-by: Leonid Moiseichuk Reviewed-by: Andy Shevchenko --- drivers/scsi/mvsas/mv_init.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/drivers/scsi/mvsas/mv_init.c b/drivers/scsi/mvsas/mv_init.c index c7c250519c4b..8280046fd1f0 100644 --- a/drivers/scsi/mvsas/mv_init.c +++ b/drivers/scsi/mvsas/mv_init.c @@ -704,24 +704,7 @@ static struct pci_device_id mvs_pci_table[] = { .class_mask = 0, .driver_data = chip_9445, }, - { - .vendor = PCI_VENDOR_ID_MARVELL_EXT, - .device = 0x9485, - .subvendor = PCI_ANY_ID, - .subdevice = 0x9480, - .class = 0, - .class_mask = 0, - .driver_data = chip_9485, - }, - { - .vendor = PCI_VENDOR_ID_MARVELL_EXT, - .device = 0x9485, - .subvendor = PCI_ANY_ID, - .subdevice = 0x9485, - .class = 0, - .class_mask = 0, - .driver_data = chip_9485, - }, + { PCI_VDEVICE(MARVELL_EXT, 0x9485), chip_9485 }, /* Marvell 9480/9485 (any vendor/model) */ { PCI_VDEVICE(OCZ, 0x1021), chip_9485}, /* OCZ RevoDrive3 */ { PCI_VDEVICE(OCZ, 0x1022), chip_9485}, /* OCZ RevoDrive3/zDriveR4 (exact model unknown) */ { PCI_VDEVICE(OCZ, 0x1040), chip_9485}, /* OCZ RevoDrive3/zDriveR4 (exact model unknown) */ -- 2.8.0.rc3