From patchwork Fri Apr 6 22:15:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xose Vazquez Perez X-Patchwork-Id: 10327631 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 286A86038F for ; Fri, 6 Apr 2018 22:15:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0B24228718 for ; Fri, 6 Apr 2018 22:15:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F368D287A4; Fri, 6 Apr 2018 22:15:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 770FF28718 for ; Fri, 6 Apr 2018 22:15:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752249AbeDFWPL (ORCPT ); Fri, 6 Apr 2018 18:15:11 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:54680 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751759AbeDFWPL (ORCPT ); Fri, 6 Apr 2018 18:15:11 -0400 Received: by mail-wm0-f65.google.com with SMTP id r191so6075922wmg.4 for ; Fri, 06 Apr 2018 15:15:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=9tTiYKsTQXt4wa4RrbXjPSvqULtxTiGeMQAL+2MVzPY=; b=YSwBuuZE3oItXTgL6d7voc6hOMoXsDYiOnoXW8c0JDMaYEqIfbEnQAHvhs9zq886hA f3heTxvK4b2yd5miwhkwgXPuQAacbq4GpzzCD8Y0HkvcPWc57ES/ehOWpt6iOQ1BmjGH a3BIfcdV11Gr/VlL8CBZmfLcT3Sz8lS0AF9572h/7OzmSKbMn61tR9080gco/wK/u444 Ym8mOPqoUGwpObS9XT4Q+B/BWGlcJa+q4LHNYqdWd3TnxoNd0ExKE+ZMNDoxuNxQjuGE HHXnxIGe5rvY6UqrQCR/Ov7/V0HCJmyj7HkDiWtxHBVg+9eThiys8k9iXEMBHRkZpYiU 9tNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=9tTiYKsTQXt4wa4RrbXjPSvqULtxTiGeMQAL+2MVzPY=; b=bsPeeISY+oWN8pZ9nkklDnsXGKm/2zq5z+XJgdZL6dbbB+sL81TvcQouuhSB2S8vVk j0C1hHQcT99iW+rI8VMsjwO70CDHXD1aCFAXeHTmTNqW2qLhfZFz8+J7+gVQV1XTtobn BsnXOK/A4G1VfXjryaX9fNw78oKKVELJuoNN4YTh/18Sz5+vivZoPvNOfvjVIQBsldV1 OkhqmEldVDQhSXRnJTNRFhxRFc4AtVTQD5WaB0Qs4x5LoiX/XG96jqIS/wt3mHPhC/aQ ZgGcmPLjPbMCQEbFPSaP+UmlDXUUibl5AgvKUXGuIM2Suf69hkUgn3tMvAsqgsIubC1H fvPA== X-Gm-Message-State: AElRT7Hi9Bn9qoPvKzOSala5I5Khr0PpYN78T1NtV8FAzME36fuOnTT3 E9cjTw/bmWUMVi2dFDotmA== X-Google-Smtp-Source: AIpwx49Z4r9g99WlmgZhF1MjfudxYgBuX3/DTMKFvKJLqroh47lAiUHZXgrijAtik/HNW+3cMN6F4Q== X-Received: by 10.28.15.78 with SMTP id 75mr13733733wmp.16.1523052909483; Fri, 06 Apr 2018 15:15:09 -0700 (PDT) Received: from localhost (100.red-83-33-156.dynamicip.rima-tde.net. [83.33.156.100]) by smtp.gmail.com with ESMTPSA id a19sm2281233wme.45.2018.04.06.15.15.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 06 Apr 2018 15:15:08 -0700 (PDT) From: Xose Vazquez Perez Cc: Xose Vazquez Perez , Hannes Reinecke , "Martin K . Petersen" , "James E . J . Bottomley" , SCSI ML Subject: [PATCH resend] scsi: devinfo: delete duplicate "Generic"/"USB Storage-SMC" device Date: Sat, 7 Apr 2018 00:15:07 +0200 Message-Id: <20180406221507.24998-1-xose.vazquez@gmail.com> X-Mailer: git-send-email 2.14.3 To: unlisted-recipients:; (no To-header on input) Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Revision is irrelevant, it's unused by the scsi infrastructure. $ egrep "Generic.*Storage-SMC" /proc/scsi/device_info 'Generic' 'USB Storage-SMC' 0x402 'Generic' 'USB Storage-SMC' 0x402 Cc: Hannes Reinecke Cc: Martin K. Petersen Cc: James E.J. Bottomley Cc: SCSI ML Signed-off-by: Xose Vazquez Perez --- drivers/scsi/scsi_devinfo.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/scsi/scsi_devinfo.c b/drivers/scsi/scsi_devinfo.c index f3b117246d47..384bed37b13b 100644 --- a/drivers/scsi/scsi_devinfo.c +++ b/drivers/scsi/scsi_devinfo.c @@ -168,8 +168,7 @@ static struct { {"easyRAID", "F8", NULL, BLIST_NOREPORTLUN}, {"FSC", "CentricStor", "*", BLIST_SPARSELUN | BLIST_LARGELUN}, {"Generic", "USB SD Reader", "1.00", BLIST_FORCELUN | BLIST_INQUIRY_36}, - {"Generic", "USB Storage-SMC", "0180", BLIST_FORCELUN | BLIST_INQUIRY_36}, - {"Generic", "USB Storage-SMC", "0207", BLIST_FORCELUN | BLIST_INQUIRY_36}, + {"Generic", "USB Storage-SMC", NULL, BLIST_FORCELUN | BLIST_INQUIRY_36}, /* FW: 0180 and 0207 */ {"HITACHI", "DF400", "*", BLIST_REPORTLUN2}, {"HITACHI", "DF500", "*", BLIST_REPORTLUN2}, {"HITACHI", "DISK-SUBSYSTEM", "*", BLIST_REPORTLUN2},