From patchwork Mon Jan 15 16:47:23 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: 10164799 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 245F2601C0 for ; Mon, 15 Jan 2018 16:47:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0F7C320174 for ; Mon, 15 Jan 2018 16:47:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 040982018E; Mon, 15 Jan 2018 16:47:30 +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=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, 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 76C112018F for ; Mon, 15 Jan 2018 16:47:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965608AbeAOQr2 (ORCPT ); Mon, 15 Jan 2018 11:47:28 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:36949 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965497AbeAOQr1 (ORCPT ); Mon, 15 Jan 2018 11:47:27 -0500 Received: by mail-wm0-f65.google.com with SMTP id v71so3251557wmv.2 for ; Mon, 15 Jan 2018 08:47:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=K2a5XXN8nIW4Ro14Uy7XaCN2WrYRbOGC0tcMUBsEL4I=; b=WW8c9UKgfHedYPiKiHecLdKzWOrb7Sz2By6OOtgWhEONKPf2Gm/CzZeO1rGRJVUMVM Zy9gOJCD8B3uvvL1VMuW9jZC+NrjX7zcw+rBkoK0irpfh7cteOU1Z7+EWVLPFASDOoOH Yt7tY8OY5N/onIJs8K/b8EvhofXP447VRSq0LGPoUBVLbYJhubM8PihNCKromerAhm5L VHYWxdYLCb5K5Tbmdqu6pG/FNw6IwrYEfCbhMVnhaQVlR8xp0hiS/OKPS3YxgUzAjp3s P0dmd1MUwi4GNntylQvpoutSdieGusXpg5+vkAzKw1HecXc2KCYwB38w2EVSnTFLAv9l Bp1A== 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=K2a5XXN8nIW4Ro14Uy7XaCN2WrYRbOGC0tcMUBsEL4I=; b=iTAk05Twc/XYmVJ4HH84Os4loHMQdNM7Lw5b4CTBsVAszZvi6hpNJhC6fIL5WUbV3Q Gpro4/XDkdNlt2yLD231RPhnQZVv6gRuYicpX9Bm2Dyh5lFANAXuS1ItAubKwqpnL2Gt 6THbm636gRezyyiHdWXRMZoRFT5lBvxps69rXTyoVYSjioQ9Z64g3rHQGvIncAS2qTJ/ cVEHA20wQoKPkbQAiCawQ+W981Im4HPMAB4190vkFRk2syrCKljblrtd8lCxNMP9cddo oF5aE92ffUdZD5DaSnnGzx1+Rejk4HoYXOINnbuNv3+1x1erxXNImpYbI5Y9cAYgV0iW o1wg== X-Gm-Message-State: AKwxytfz7d0dm55fNyjbLK0Xv29QQZVDMJeihmFBmPatm6C31RMuDkrS MCZS0b9kK/+P2e9XXKvlHknkIrM= X-Google-Smtp-Source: ACJfBotFv/rXkFIsNc57VTEhE1t88CdAOUf1HackrF0a2vkzR2bg516gi7yrueSPgjBVIYfr2B5BcA== X-Received: by 10.28.133.148 with SMTP id h142mr9937535wmd.110.1516034845714; Mon, 15 Jan 2018 08:47:25 -0800 (PST) Received: from localhost ([46.222.61.89]) by smtp.gmail.com with ESMTPSA id u79sm516100wma.10.2018.01.15.08.47.24 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 15 Jan 2018 08:47:25 -0800 (PST) From: Xose Vazquez Perez Cc: Xose Vazquez Perez , Hannes Reinecke , "Martin K . Petersen" , "James E . J . Bottomley" , SCSI ML Subject: [PATCH] scsi: devinfo: fix format of the device list Date: Mon, 15 Jan 2018 17:47:23 +0100 Message-Id: <20180115164723.1943-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 Replace "" with NULL for product revision level, and merge TEXEL duplicate entries. 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 | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/scsi_devinfo.c b/drivers/scsi/scsi_devinfo.c index a15eb4d15114..769fdcba61df 100644 --- a/drivers/scsi/scsi_devinfo.c +++ b/drivers/scsi/scsi_devinfo.c @@ -109,8 +109,8 @@ static struct { * seagate controller, which causes SCSI code to reset bus. */ {"HP", "C1750A", "3226", BLIST_NOLUN}, /* scanjet iic */ - {"HP", "C1790A", "", BLIST_NOLUN}, /* scanjet iip */ - {"HP", "C2500A", "", BLIST_NOLUN}, /* scanjet iicx */ + {"HP", "C1790A", NULL, BLIST_NOLUN}, /* scanjet iip */ + {"HP", "C2500A", NULL, BLIST_NOLUN}, /* scanjet iicx */ {"MEDIAVIS", "CDR-H93MV", "1.31", BLIST_NOLUN}, /* locks up */ {"MICROTEK", "ScanMaker II", "5.61", BLIST_NOLUN}, /* responds to all lun */ {"MITSUMI", "CD-R CR-2201CS", "6119", BLIST_NOLUN}, /* locks up */ @@ -120,7 +120,7 @@ static struct { {"QUANTUM", "FIREBALL ST4.3S", "0F0C", BLIST_NOLUN}, /* locks up */ {"RELISYS", "Scorpio", NULL, BLIST_NOLUN}, /* responds to all lun */ {"SANKYO", "CP525", "6.64", BLIST_NOLUN}, /* causes failed REQ SENSE, extra reset */ - {"TEXEL", "CD-ROM", "1.06", BLIST_NOLUN}, + {"TEXEL", "CD-ROM", "1.06", BLIST_NOLUN | BLIST_BORKEN}, {"transtec", "T5008", "0001", BLIST_NOREPORTLUN }, {"YAMAHA", "CDR100", "1.00", BLIST_NOLUN}, /* locks up */ {"YAMAHA", "CDR102", "1.00", BLIST_NOLUN}, /* locks up */ @@ -255,7 +255,6 @@ static struct { {"ST650211", "CF", NULL, BLIST_RETRY_HWERROR}, {"SUN", "T300", "*", BLIST_SPARSELUN}, {"SUN", "T4", "*", BLIST_SPARSELUN}, - {"TEXEL", "CD-ROM", "1.06", BLIST_BORKEN}, {"Tornado-", "F4", "*", BLIST_NOREPORTLUN}, {"TOSHIBA", "CDROM", NULL, BLIST_ISROM}, {"TOSHIBA", "CD-ROM", NULL, BLIST_ISROM},