From patchwork Mon Jul 16 13:39:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siva Rebbagondla X-Patchwork-Id: 10526805 X-Patchwork-Delegate: kvalo@adurom.com 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 79ECD60348 for ; Mon, 16 Jul 2018 13:36:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 67E20287B4 for ; Mon, 16 Jul 2018 13:36:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5B3BF287CB; Mon, 16 Jul 2018 13:36: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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI 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 F1EE8287B4 for ; Mon, 16 Jul 2018 13:36:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727738AbeGPODj (ORCPT ); Mon, 16 Jul 2018 10:03:39 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:39817 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727313AbeGPODj (ORCPT ); Mon, 16 Jul 2018 10:03:39 -0400 Received: by mail-pf0-f196.google.com with SMTP id j8-v6so1664242pff.6 for ; Mon, 16 Jul 2018 06:36: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:in-reply-to:references; bh=aibTvh+MnZBcV1CJgGv4fgvEnJ/scRUO9SAZCuy/5Es=; b=pXfCqZ8pR6HyIzIAQF3WwbSqH0hsAdxVaieYAywZLoDRvyaI5bdVUCPXQV1+LW+rdV a4Nzlv21E5GHYFO8/yC/eF8tV/swVy4eCp/KYYqVhOrsMbz1ZPCTBvPEoCiF5BUecQ6q NLS3RG6vl2/JjmwwfjyjmlUx1MuAiiV1g1s0+Abj/ZmWkRQSkyFtJNNC1zLNwaJ1I3xh v+aeRc8lI8XZ3G7jWEadpGfvZ9md9XfWHSc1TX3Z3oZH/mxnH/X0SGzvrDA9IsCR3p7v ZIgNiKOBFZBr6HAz1VD1q1U5wq8M6iOXvK6H5yzrsluJ4fnAjWU/ZAwbjlrS1yK7KUCZ o9sQ== 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:in-reply-to :references; bh=aibTvh+MnZBcV1CJgGv4fgvEnJ/scRUO9SAZCuy/5Es=; b=ofr2/FmsbgV2Szpn+jl55dCIUlW0/k+sVyBXDuneTt4hSvaHpeSzEsI6oAW9yIPbu+ THDlmO0wyHewN8K/21AMOD6jSMsLy70KgfynZfcSxMUFpVhMSuCPs4ul3CcCdBWozq/5 6Hy1hxqId2UfiQvyP+zMFEkwBVkJG6Zbu4Td264HDuTtcRJCSxPq36cQRJTFLxLO+/eO VuXID04HUNYMYs46P/ZmCBtAi3WAdssaO3DK5OSd0n3FnR6yqskH/Da0hcfEswjwfn/h F6RtDC9BX0AGTUTFeAHjr0UhQbHo1lvvdnEyJxhFrZVzYiaFUOggaCHKyrTLyywC4TPn nwwQ== X-Gm-Message-State: AOUpUlE8hz7k50Iy96jtayCdTVFuZpV9FIRMpvLrOnJf7kPzbZ31ht+Q W8mMZIFqBG7z1rT+bwDKR1kONKWyF2U= X-Google-Smtp-Source: AAOMgpfEyOUm8wfy0JQHUZPgeDryeO7rBRlqBZssKqc3OInkqhiZi6mm+kogOv/aoX0R8Lkw0stIyw== X-Received: by 2002:aa7:81d3:: with SMTP id c19-v6mr18162691pfn.224.1531748169852; Mon, 16 Jul 2018 06:36:09 -0700 (PDT) Received: from cpu459.localdomain ([27.59.226.48]) by smtp.gmail.com with ESMTPSA id t3-v6sm53756167pfk.161.2018.07.16.06.36.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Jul 2018 06:36:09 -0700 (PDT) From: Siva Rebbagondla To: Kalle Valo Cc: linux-wireless@vger.kernel.org, Sushant Kumar Mishra , Siva Rebbagondla , Amol Hanwate Subject: [PATCH 1/6] rsi: remove redundant device ids Date: Mon, 16 Jul 2018 19:09:32 +0530 Message-Id: <1531748377-29215-2-git-send-email-siva8118@gmail.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1531748377-29215-1-git-send-email-siva8118@gmail.com> References: <1531748377-29215-1-git-send-email-siva8118@gmail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Siva Rebbagondla Removing redundant device id's from both usb and sdio idtables, as rsi driver currently supporting only one module(RS9113). Also, replaced ids with specific defines. Signed-off-by: Siva Rebbagondla --- drivers/net/wireless/rsi/rsi_91x_sdio.c | 5 +---- drivers/net/wireless/rsi/rsi_91x_usb.c | 6 +----- drivers/net/wireless/rsi/rsi_sdio.h | 3 +++ drivers/net/wireless/rsi/rsi_usb.h | 3 +++ 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/net/wireless/rsi/rsi_91x_sdio.c b/drivers/net/wireless/rsi/rsi_91x_sdio.c index 416981d..5733e44 100644 --- a/drivers/net/wireless/rsi/rsi_91x_sdio.c +++ b/drivers/net/wireless/rsi/rsi_91x_sdio.c @@ -1394,10 +1394,7 @@ static const struct dev_pm_ops rsi_pm_ops = { #endif static const struct sdio_device_id rsi_dev_table[] = { - { SDIO_DEVICE(0x303, 0x100) }, - { SDIO_DEVICE(0x041B, 0x0301) }, - { SDIO_DEVICE(0x041B, 0x0201) }, - { SDIO_DEVICE(0x041B, 0x9330) }, + { SDIO_DEVICE(RSI_SDIO_VID_9113, RSI_SDIO_PID_9113) }, { /* Blank */}, }; diff --git a/drivers/net/wireless/rsi/rsi_91x_usb.c b/drivers/net/wireless/rsi/rsi_91x_usb.c index 6ce6b75..c0a163e 100644 --- a/drivers/net/wireless/rsi/rsi_91x_usb.c +++ b/drivers/net/wireless/rsi/rsi_91x_usb.c @@ -835,11 +835,7 @@ static int rsi_resume(struct usb_interface *intf) #endif static const struct usb_device_id rsi_dev_table[] = { - { USB_DEVICE(0x0303, 0x0100) }, - { USB_DEVICE(0x041B, 0x0301) }, - { USB_DEVICE(0x041B, 0x0201) }, - { USB_DEVICE(0x041B, 0x9330) }, - { USB_DEVICE(0x1618, 0x9113) }, + { USB_DEVICE(RSI_USB_VID_9113, RSI_USB_PID_9113) }, { /* Blank */}, }; diff --git a/drivers/net/wireless/rsi/rsi_sdio.h b/drivers/net/wireless/rsi/rsi_sdio.h index 353dbdf..66dcd2e 100644 --- a/drivers/net/wireless/rsi/rsi_sdio.h +++ b/drivers/net/wireless/rsi/rsi_sdio.h @@ -28,6 +28,9 @@ #include #include "rsi_main.h" +#define RSI_SDIO_VID_9113 0x041B +#define RSI_SDIO_PID_9113 0x9330 + enum sdio_interrupt_type { BUFFER_FULL = 0x0, BUFFER_AVAILABLE = 0x2, diff --git a/drivers/net/wireless/rsi/rsi_usb.h b/drivers/net/wireless/rsi/rsi_usb.h index b6fe79f..5b2eddd 100644 --- a/drivers/net/wireless/rsi/rsi_usb.h +++ b/drivers/net/wireless/rsi/rsi_usb.h @@ -22,6 +22,9 @@ #include "rsi_main.h" #include "rsi_common.h" +#define RSI_USB_VID_9113 0x1618 +#define RSI_USB_PID_9113 0x9113 + #define USB_INTERNAL_REG_1 0x25000 #define RSI_USB_READY_MAGIC_NUM 0xab #define FW_STATUS_REG 0x41050012