From patchwork Wed May 20 12:54:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Pali_Roh=C3=A1r?= X-Patchwork-Id: 215564 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A60D2C433E0 for ; Wed, 20 May 2020 12:54:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6F5E52070A for ; Wed, 20 May 2020 12:54:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589979280; bh=W4N5wm88P16gmtjOPXeI9WQcMR68v97KzmHVFkAQ3CA=; h=From:To:Cc:Subject:Date:List-ID:From; b=AcXKYmZXePNFl9o1UB4US2U2kH623TgLiTv62knh1kgrJjmJmRBUGys9fIh6B25Di GMjjdXorbtqdBbOh9bv42J+gIpB20zZ/VkwCHzra59yw0TRcnUSk1LLtakhRvQIsEm tiu3vDsWx4I+B3nnPGcWzV3cI+6amVl3RhLeAf3Y= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726859AbgETMyd (ORCPT ); Wed, 20 May 2020 08:54:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:45536 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726443AbgETMyd (ORCPT ); Wed, 20 May 2020 08:54:33 -0400 Received: from pali.im (pali.im [31.31.79.79]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C9F3B2070A; Wed, 20 May 2020 12:54:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589979272; bh=W4N5wm88P16gmtjOPXeI9WQcMR68v97KzmHVFkAQ3CA=; h=From:To:Cc:Subject:Date:From; b=oEEGWQqoN5HomQUw17QHu6yLkj5O4iWeYmF0Tyl8Z0R2mCMT9oEXo1BLuriLhBVQ7 v9Lf5kppmcd+gK6owBIMfLubl89NE+UAC2kKup+7xj2HBwioZDoCNuueg3ynD6Vhnn UefC7wXpYD/YjptErErIVaJ2o+dxKvdugRVMR2LM= Received: by pali.im (Postfix) id 9D24365A; Wed, 20 May 2020 14:54:30 +0200 (CEST) From: =?utf-8?q?Pali_Roh=C3=A1r?= To: Solomon Peachy , Kalle Valo , "David S. Miller" Cc: linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] cw1200: Remove local sdio VENDOR and DEVICE id definitions Date: Wed, 20 May 2020 14:54:10 +0200 Message-Id: <20200520125410.31757-1-pali@kernel.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org They are already present in linux/mmc/sdio_ids.h. Signed-off-by: Pali Rohár --- drivers/net/wireless/st/cw1200/cw1200_sdio.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/net/wireless/st/cw1200/cw1200_sdio.c b/drivers/net/wireless/st/cw1200/cw1200_sdio.c index 43e012073dbf..b65ec14136c7 100644 --- a/drivers/net/wireless/st/cw1200/cw1200_sdio.c +++ b/drivers/net/wireless/st/cw1200/cw1200_sdio.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include "cw1200.h" @@ -48,14 +49,6 @@ struct hwbus_priv { const struct cw1200_platform_data_sdio *pdata; }; -#ifndef SDIO_VENDOR_ID_STE -#define SDIO_VENDOR_ID_STE 0x0020 -#endif - -#ifndef SDIO_DEVICE_ID_STE_CW1200 -#define SDIO_DEVICE_ID_STE_CW1200 0x2280 -#endif - static const struct sdio_device_id cw1200_sdio_ids[] = { { SDIO_DEVICE(SDIO_VENDOR_ID_STE, SDIO_DEVICE_ID_STE_CW1200) }, { /* end: all zeroes */ },