From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754508AbbCXT6w (ORCPT ); Tue, 24 Mar 2015 15:58:52 -0400 Received: from mail-pa0-f51.google.com ([209.85.220.51]:34057 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752358AbbCXT6v (ORCPT ); Tue, 24 Mar 2015 15:58:51 -0400 From: Niranjan Dighe To: gregkh@linuxfoundation.org Cc: liodot@gmail.com, charrer@alacritech.com, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Niranjan Dighe Subject: [PATCH] Staging: slicoss: Fix checkpatch.pl issues Date: Wed, 25 Mar 2015 01:28:43 +0530 Message-Id: <1427227123-8570-1-git-send-email-niranjan.dighe@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Removed unused block of code guarded by #ifdef SLIC_TRACE_DUMP_ENABLED And removed redundant static char *slic_banner and replaced actual string in place of format string. Signed-off-by: Niranjan Dighe diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c index 3104cb0..f3110f7 100644 --- a/drivers/staging/slicoss/slicoss.c +++ b/drivers/staging/slicoss/slicoss.c @@ -98,7 +98,6 @@ #include "slic.h" static uint slic_first_init = 1; -static char *slic_banner = "Alacritech SLIC Technology(tm) Server and Storage Accelerator (Non-Accelerated)"; static char *slic_proc_version = "2.0.351 2006/07/14 12:26:00"; @@ -2553,41 +2552,6 @@ static int slic_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) slic_intagg_set(adapter, intagg); return 0; -#ifdef SLIC_TRACE_DUMP_ENABLED - case SIOCSLICTRACEDUMP: - { - u32 value; - - DBG_IOCTL("slic_ioctl SIOCSLIC_TRACE_DUMP\n"); - - if (copy_from_user(data, rq->ifr_data, 28)) { - PRINT_ERROR - ("slic: copy_from_user FAILED getting initial simba param\n"); - return -EFAULT; - } - - value = data[0]; - if (tracemon_request == SLIC_DUMP_DONE) { - PRINT_ERROR - ("ATK Diagnostic Trace Dump Requested\n"); - tracemon_request = SLIC_DUMP_REQUESTED; - tracemon_request_type = value; - tracemon_timestamp = jiffies; - } else if ((tracemon_request == SLIC_DUMP_REQUESTED) || - (tracemon_request == - SLIC_DUMP_IN_PROGRESS)) { - PRINT_ERROR - ("ATK Diagnostic Trace Dump Requested but already in progress... ignore\n"); - } else { - PRINT_ERROR - ("ATK Diagnostic Trace Dump Requested\n"); - tracemon_request = SLIC_DUMP_REQUESTED; - tracemon_request_type = value; - tracemon_timestamp = jiffies; - } - return 0; - } -#endif case SIOCETHTOOL: if (copy_from_user(&ecmd, rq->ifr_data, sizeof(ecmd))) return -EFAULT; @@ -3081,7 +3045,8 @@ static int slic_entry_probe(struct pci_dev *pcidev, return err; if (did_version++ == 0) { - dev_info(&pcidev->dev, "%s\n", slic_banner); + dev_info(&pcidev->dev, + "Alacritech SLIC Technology(tm) Server and Storage Accelerator (Non-Accelerated)\n"); dev_info(&pcidev->dev, "%s\n", slic_proc_version); } -- 1.9.1