Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp4793879pxk; Wed, 30 Sep 2020 11:50:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzj1+nRl42WA65BNmlHnqAbZz0MPycxWG3aDEl4DY3rabV/VbVE2s3v+aPoFL1QxiYrDvXd X-Received: by 2002:a05:6402:b68:: with SMTP id cb8mr4404911edb.350.1601491829262; Wed, 30 Sep 2020 11:50:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601491829; cv=none; d=google.com; s=arc-20160816; b=DzD53wZxUBljEnyT8BrQUKQLzgIpqbyfMh5dIbTv7Wz52bgg1EPByIaQBSNy96tbYS BDKPi/5KXIZr/KcnJyJKh/RDLVNzNy8/bExCQ5aG++fGEEQHtgCpM3IhrU5+twkk1y0f Kei340B3JqDGQAYpUW8yBjn2PMKQN5GYJgX/zawo49F4CbsZJKmtRHOzi5RVoHANwHQW XWhFSvy/CyWGlvdZZZUvk3i5p97XMv8hqSEFWN3phBDPKKvRu/z95NEM8odJJXcc0ijB BTEhoWL/Mb8cpVFT3T2OuoWoA0nYNHBN0OW8jaSOX1FKcyGwRoxj+MpYAxd4r/Tskkd/ debg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=Izlxb9+XOKoIoUFJLaxvmcAkV/KEx2FB3We8uGD79d8=; b=SJdBlv45jI8Sy4uFo6K9qjsIY7nIw7S4RqUv15WqOcLN/P/Psr7IjILba7sGXTTIVI EbMVCwhIcReEGv4pga6qstQQ7jreCeBy0xBQhXc7hUghlMhFhaMLisji+n/9Uyn5duDE 4z//1PAWE8PcyGe+ecOoROvGTYUB3tX+TnKSC7HrxCfSp3Y4wimY90qHgnAFSTQfMgXc W34DtwrEszFlTDFGEHTANLUPgHpsi9JqZ7JaCtrrdysmPiaubpc3VTMjA1eBNHu5I6ve q4+gVx0Ui+XAf2n/cosR7i6GLGc92lBw0AzbY7mCSyCCp8jO4KS0lisr4TZU0bbBAT2s eQJQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id q6si1775446eji.17.2020.09.30.11.50.06; Wed, 30 Sep 2020 11:50:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729578AbgI3SsV (ORCPT + 99 others); Wed, 30 Sep 2020 14:48:21 -0400 Received: from relay1-d.mail.gandi.net ([217.70.183.193]:49525 "EHLO relay1-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725385AbgI3SsT (ORCPT ); Wed, 30 Sep 2020 14:48:19 -0400 X-Originating-IP: 90.65.88.165 Received: from localhost (lfbn-lyo-1-1908-165.w90-65.abo.wanadoo.fr [90.65.88.165]) (Authenticated sender: alexandre.belloni@bootlin.com) by relay1-d.mail.gandi.net (Postfix) with ESMTPSA id DF8F2240007; Wed, 30 Sep 2020 18:48:15 +0000 (UTC) From: Alexandre Belloni To: Dominik Brodowski , Nicolas Ferre , Alexandre Belloni , Ludovic Desroches Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] pcmcia: at91_cf: move definitions locally Date: Wed, 30 Sep 2020 20:48:02 +0200 Message-Id: <20200930184804.3127757-1-alexandre.belloni@bootlin.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Flag: yes X-Spam-Level: ************************** X-GND-Spam-Score: 400 X-GND-Status: SPAM Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org struct at91_cf_data is only used in the driver since all the platforms moved to device tree, move its definition locally. Signed-off-by: Alexandre Belloni --- drivers/pcmcia/at91_cf.c | 11 +++++++++++ include/linux/platform_data/atmel.h | 12 ------------ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/drivers/pcmcia/at91_cf.c b/drivers/pcmcia/at91_cf.c index 7db0e9c74dfc..1d59c7240a09 100644 --- a/drivers/pcmcia/at91_cf.c +++ b/drivers/pcmcia/at91_cf.c @@ -35,6 +35,17 @@ #define CF_IO_PHYS (1 << 23) #define CF_MEM_PHYS (0x017ff800) +struct at91_cf_data { + int irq_pin; /* I/O IRQ */ + int det_pin; /* Card detect */ + int vcc_pin; /* power switching */ + int rst_pin; /* card reset */ + u8 chipselect; /* EBI Chip Select number */ + u8 flags; +#define AT91_CF_TRUE_IDE 0x01 +#define AT91_IDE_SWAP_A0_A2 0x02 +}; + struct regmap *mc; /*--------------------------------------------------------------------------*/ diff --git a/include/linux/platform_data/atmel.h b/include/linux/platform_data/atmel.h index 99e6069c5fd8..73f63be509c4 100644 --- a/include/linux/platform_data/atmel.h +++ b/include/linux/platform_data/atmel.h @@ -6,18 +6,6 @@ #ifndef __ATMEL_H__ #define __ATMEL_H__ - /* Compact Flash */ -struct at91_cf_data { - int irq_pin; /* I/O IRQ */ - int det_pin; /* Card detect */ - int vcc_pin; /* power switching */ - int rst_pin; /* card reset */ - u8 chipselect; /* EBI Chip Select number */ - u8 flags; -#define AT91_CF_TRUE_IDE 0x01 -#define AT91_IDE_SWAP_A0_A2 0x02 -}; - /* FIXME: this needs a better location, but gets stuff building again */ #ifdef CONFIG_ATMEL_PM extern int at91_suspend_entering_slow_clock(void); -- 2.26.2