From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932140AbdK1Cxq (ORCPT ); Mon, 27 Nov 2017 21:53:46 -0500 Received: from esa5.dell-outbound.iphmx.com ([68.232.153.95]:48192 "EHLO esa5.dell-outbound.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753372AbdK1Cxn (ORCPT ); Mon, 27 Nov 2017 21:53:43 -0500 IronPort-PHdr: =?us-ascii?q?9a23=3Ao8UgURxygiFyIUXXCy+O+j09IxM/srCxBDY+r6Qd?= =?us-ascii?q?2+0UIJqq85mqBkHD//Il1AaPBtSLraocw8Pt8InYEVQa5piAtH1QOLdtbDQizf?= =?us-ascii?q?ssogo7HcSeAlf6JvO5JwYzHcBFSUM3tyrjaRsdF8nxfUDdrWOv5jAOBBr/KRB1?= =?us-ascii?q?JuPoEYLOksi7ze6/9pnQbglSmDaxfa55IQmrownWqsQYm5ZpJLwryhvOrHtIeu?= =?us-ascii?q?BWyn1tKFmOgRvy5dq+8YB6/ShItP0v68BPUaPhf6QlVrNYFygpM3o05MLwqxbO?= =?us-ascii?q?SxaE62YGXWUXlhpIBBXF7A3/U5zsvCb2qvZx1S+HNsDwULs6Wymt771zRRHoli?= =?us-ascii?q?kJKiI5/m/UhMx+jq1boQ6uqRNwzIPPfIGVLfh+cr/Bcd8GWGZMWNtaWSxbAoO7?= =?us-ascii?q?aosCF+0MM/xGoInnvVsPrQGyCguxBOz1zD9FnWL50rM+0+QlCw3JwAsgH9cXvX?= =?us-ascii?q?nSsd77N78SXPi0waTL1znPcf1b1Snn5ITVch0sr+uAUaxsfcff0UUjCh/Jgk+N?= =?us-ascii?q?pYD5IT+ZzPkBv3Wb4uZ6S+6ihGAqpxlsrjWgyMogkJTFi4MUx1ze9ih0wJw5Kc?= =?us-ascii?q?C4RUN6Z9OvDYFeuDuAN4RsR8MvW2RouCEnxbIYoZO7Zy0KyIg/xx7YdvyHb5CE?= =?us-ascii?q?4hL9W+aVJjd1nGxqeKmliBuy60Sv1/PzVs2w0FpTqSpFj8XMuWsK1xzO7MiIV+?= =?us-ascii?q?Vx8l2g2TaX1wDT7+5FLVoomqrcLp4t2r8wlpwNvkTfBiL7mUb7gLWIekgq5OSk?= =?us-ascii?q?8fnrb7Xoq5OGKYN4lg/zPrwrmsOlAOQ4NgYOX3Kc+eS5zLDt51P2QK9Qjvw2iK?= =?us-ascii?q?XWso3aKt4dpqOiHgBazIIj6xKlAzi619QYmGELLEhZdxKfk4jpJ1bOLej8Dfe+?= =?us-ascii?q?hVSsjThqy+nFPrL/GJXNKGbMkLP6cLZj5E5T1hAzwcpc551KELEBJuz8WkvruN?= =?us-ascii?q?zfFB85PF/8/+GyXM9g17QQVGSAKrWUOafJsFvO7eUqZeKKMstd7DLwJr4n4Pjj?= =?us-ascii?q?llc9mFkUZ67v2oEYPjTwSv18JUmxaGDqjt1HHWpc+kJqQ/bnh16CeTpSYWuiUa?= =?us-ascii?q?Uh4D0yFIOhC8HEXI/7xPTVwSO1WJ1fYHtdDVakFXbufp+DHfAWZ3TBDNVml2lQ?= =?us-ascii?q?bbW7UZ5n5Aynsif2xr5jaOHT/3tL5trYyNFp6riLxlkJ/jtuApHF3g=3D=3D?= X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A2E3AAA8zhxah8uZ6ERcGQEBAQEBAQEBA?= =?us-ascii?q?QEBAQcBAQEBAYQSgSUHjhiPFIF9lm2CEQqCAYM6AoR0PxgBAQEBAQEBAQEBAhA?= =?us-ascii?q?BAQEKCwkIKC+COCKCRgEBAQEDJ1IMBAIBCBEEAQEoB0YJCAIEAQ0FCIoaqHg6h?= =?us-ascii?q?BYBhmMBAQEBAQEBAwEBAQEBAQEBAQEBHQkBgzCCB4M9gyyFAEKFUgWKN4gMkAO?= =?us-ascii?q?VA4IfkTiKN4wDgTofggpvgneCUhAMgSwBOneJDoEUAQEB?= X-IPAS-Result: =?us-ascii?q?A2E3AAA8zhxah8uZ6ERcGQEBAQEBAQEBAQEBAQcBAQEBAYQ?= =?us-ascii?q?SgSUHjhiPFIF9lm2CEQqCAYM6AoR0PxgBAQEBAQEBAQEBAhABAQEKCwkIKC+CO?= =?us-ascii?q?CKCRgEBAQEDJ1IMBAIBCBEEAQEoB0YJCAIEAQ0FCIoaqHg6hBYBhmMBAQEBAQE?= =?us-ascii?q?BAwEBAQEBAQEBAQEBHQkBgzCCB4M9gyyFAEKFUgWKN4gMkAOVA4IfkTiKN4wDg?= =?us-ascii?q?TofggpvgneCUhAMgSwBOneJDoEUAQEB?= From: X-LoopCount0: from 10.166.136.211 X-IronPort-AV: E=Sophos;i="5.44,466,1505797200"; d="scan'208";a="179533065" X-DLP: DLP_GlobalPCIDSS To: , , , , CC: , , Subject: RE: [PATCH v7,1/2] misc: rtsx: Move Realtek Card Reader Driver to misc Thread-Topic: [PATCH v7,1/2] misc: rtsx: Move Realtek Card Reader Driver to misc Thread-Index: AQHTZ1JFCsfOhKYt/EaD8aWYWGZpCKMpGUfQ Date: Tue, 28 Nov 2017 02:53:37 +0000 Message-ID: References: <1511768071-23143-1-git-send-email-rui_feng@realsil.com.cn> In-Reply-To: <1511768071-23143-1-git-send-email-rui_feng@realsil.com.cn> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-transport-fromentityheader: Hosted x-originating-ip: [10.102.115.243] Content-Type: text/plain; charset="iso-8859-1" MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from quoted-printable to 8bit by nfs id vAS2ronY018450 Hi Greg. The Patches have been tested basing on V4.15-rc1 successfully. The sdcard function is working well. Tested-by: Perry Yuan keep up the good work Perry  Yuan Dell | Client Software Group | Firmware Principal Engineer -----Original Message----- From: linux-kernel-owner@vger.kernel.org [mailto:linux-kernel-owner@vger.kernel.org] On Behalf Of rui_feng@realsil.com.cn Sent: Monday, November 27, 2017 3:35 PM To: lee.jones@linaro.org; arnd@arndb.de; gregkh@linuxfoundation.org; ulf.hansson@linaro.org Cc: linux-kernel@vger.kernel.org; ricky_wu@realtek.com; bristot@redhat.com; Rui Feng Subject: [PATCH v7,1/2] misc: rtsx: Move Realtek Card Reader Driver to misc From: Rui Feng Because Realtek card reader drivers are pcie and usb drivers, and they bridge mmc subsystem and memstick subsystem, they are not mfd drivers. Greg and Lee Jones had a discussion about where to put the drivers, the result is that misc is a good place for them, so I move all files to misc. If I don't move them to a right place, I can't add any patch for this driver. Signed-off-by: Rui Feng Acked-by: Arnd Bergmann Acked-for-MFD-by: Lee Jones Reviewed-by: Daniel Bristot de Oliveira Acked-by: Ulf Hansson v7 changes: * update missing modification in memstic * add Acked-by --- drivers/memstick/host/Kconfig | 4 ++-- drivers/memstick/host/rtsx_pci_ms.c | 2 +- drivers/memstick/host/rtsx_usb_ms.c | 2 +- drivers/mfd/Kconfig | 21 --------------------- drivers/mfd/Makefile | 4 ---- drivers/misc/Kconfig | 5 +++++ drivers/misc/Makefile | 1 + drivers/misc/cardreader/Kconfig | 20 ++++++++++++++++++++ drivers/misc/cardreader/Makefile | 4 ++++ drivers/{mfd => misc/cardreader}/rtl8411.c | 2 +- drivers/{mfd => misc/cardreader}/rts5209.c | 2 +- drivers/{mfd => misc/cardreader}/rts5227.c | 2 +- drivers/{mfd => misc/cardreader}/rts5229.c | 2 +- drivers/{mfd => misc/cardreader}/rts5249.c | 3 +-- drivers/{mfd => misc/cardreader}/rtsx_pcr.c | 2 +- drivers/{mfd => misc/cardreader}/rtsx_pcr.h | 2 +- drivers/{mfd => misc/cardreader}/rtsx_usb.c | 2 +- drivers/mmc/host/Kconfig | 4 ++-- drivers/mmc/host/rtsx_pci_sdmmc.c | 2 +- drivers/mmc/host/rtsx_usb_sdmmc.c | 2 +- include/linux/{mfd => }/rtsx_common.h | 0 include/linux/{mfd => }/rtsx_pci.h | 2 +- include/linux/{mfd => }/rtsx_usb.h | 0 23 files changed, 47 insertions(+), 43 deletions(-) create mode 100644 drivers/misc/cardreader/Kconfig create mode 100644 drivers/misc/cardreader/Makefile rename drivers/{mfd => misc/cardreader}/rtl8411.c (99%) rename drivers/{mfd => misc/cardreader}/rts5209.c (99%) rename drivers/{mfd => misc/cardreader}/rts5227.c (99%) rename drivers/{mfd => misc/cardreader}/rts5229.c (99%) rename drivers/{mfd => misc/cardreader}/rts5249.c (99%) rename drivers/{mfd => misc/cardreader}/rtsx_pcr.c (99%) rename drivers/{mfd => misc/cardreader}/rtsx_pcr.h (99%) rename drivers/{mfd => misc/cardreader}/rtsx_usb.c (99%) rename include/linux/{mfd => }/rtsx_common.h (100%) rename include/linux/{mfd => }/rtsx_pci.h (99%) rename include/linux/{mfd => }/rtsx_usb.h (100%) diff --git a/drivers/memstick/host/Kconfig b/drivers/memstick/host/Kconfig index 7310e32..aa2b078 100644 --- a/drivers/memstick/host/Kconfig +++ b/drivers/memstick/host/Kconfig @@ -45,7 +45,7 @@ config MEMSTICK_R592 config MEMSTICK_REALTEK_PCI tristate "Realtek PCI-E Memstick Card Interface Driver" - depends on MFD_RTSX_PCI + depends on MISC_RTSX_PCI help Say Y here to include driver code to support Memstick card interface of Realtek PCI-E card reader @@ -55,7 +55,7 @@ config MEMSTICK_REALTEK_PCI config MEMSTICK_REALTEK_USB tristate "Realtek USB Memstick Card Interface Driver" - depends on MFD_RTSX_USB + depends on MISC_RTSX_USB help Say Y here to include driver code to support Memstick card interface of Realtek RTS5129/39 series USB card reader diff --git a/drivers/memstick/host/rtsx_pci_ms.c b/drivers/memstick/host/rtsx_pci_ms.c index 818fa94..a44b457 100644 --- a/drivers/memstick/host/rtsx_pci_ms.c +++ b/drivers/memstick/host/rtsx_pci_ms.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include struct realtek_pci_ms { diff --git a/drivers/memstick/host/rtsx_usb_ms.c b/drivers/memstick/host/rtsx_usb_ms.c index 2e3cf01..4f64563 100644 --- a/drivers/memstick/host/rtsx_usb_ms.c +++ b/drivers/memstick/host/rtsx_usb_ms.c @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index fc5e4fe..80fd23f 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -916,17 +916,6 @@ config MFD_RDC321X southbridge which provides access to GPIOs and Watchdog using the southbridge PCI device configuration space. -config MFD_RTSX_PCI - tristate "Realtek PCI-E card reader" - depends on PCI - select MFD_CORE - help - This supports for Realtek PCI-Express card reader including rts5209, - rts5227, rts522A, rts5229, rts5249, rts524A, rts525A, rtl8411, etc. - Realtek card reader supports access to many types of memory cards, - such as Memory Stick, Memory Stick Pro, Secure Digital and - MultiMediaCard. - config MFD_RT5033 tristate "Richtek RT5033 Power Management IC" depends on I2C @@ -940,16 +929,6 @@ config MFD_RT5033 sub-devices like charger, fuel gauge, flash LED, current source, LDO and Buck. -config MFD_RTSX_USB - tristate "Realtek USB card reader" - depends on USB - select MFD_CORE - help - Select this option to get support for Realtek USB 2.0 card readers - including RTS5129, RTS5139, RTS5179 and RTS5170. - Realtek card reader supports access to many types of memory cards, - such as Memory Stick Pro, Secure Digital and MultiMediaCard. - config MFD_RC5T583 bool "Ricoh RC5T583 Power Management system device" depends on I2C=y diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile index 8703ff1..921eb99 100644 --- a/drivers/mfd/Makefile +++ b/drivers/mfd/Makefile @@ -19,10 +19,6 @@ obj-$(CONFIG_MFD_CROS_EC_I2C) += cros_ec_i2c.o obj-$(CONFIG_MFD_CROS_EC_SPI) += cros_ec_spi.o obj-$(CONFIG_MFD_EXYNOS_LPASS) += exynos-lpass.o -rtsx_pci-objs := rtsx_pcr.o rts5209.o rts5229.o rtl8411.o rts5227.o rts5249.o -obj-$(CONFIG_MFD_RTSX_PCI) += rtsx_pci.o -obj-$(CONFIG_MFD_RTSX_USB) += rtsx_usb.o - obj-$(CONFIG_HTC_PASIC3) += htc-pasic3.o obj-$(CONFIG_HTC_I2CPLD) += htc-i2cpld.o diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index 8136dc7..b328552 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -506,6 +506,10 @@ config PCI_ENDPOINT_TEST Enable this configuration option to enable the host side test driver for PCI Endpoint. +config MISC_RTSX + tristate + default MISC_RTSX_PCI || MISC_RTSX_USB + source "drivers/misc/c2port/Kconfig" source "drivers/misc/eeprom/Kconfig" source "drivers/misc/cb710/Kconfig" @@ -518,4 +522,5 @@ source "drivers/misc/mic/Kconfig" source "drivers/misc/genwqe/Kconfig" source "drivers/misc/echo/Kconfig" source "drivers/misc/cxl/Kconfig" +source "drivers/misc/cardreader/Kconfig" endmenu diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index ad0e64f..fa440bb 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile @@ -56,6 +56,7 @@ obj-$(CONFIG_CXL_BASE) += cxl/ obj-$(CONFIG_ASPEED_LPC_CTRL) += aspeed-lpc-ctrl.o obj-$(CONFIG_ASPEED_LPC_SNOOP) += aspeed-lpc-snoop.o obj-$(CONFIG_PCI_ENDPOINT_TEST) += pci_endpoint_test.o +obj-$(CONFIG_MISC_RTSX) += cardreader/ lkdtm-$(CONFIG_LKDTM) += lkdtm_core.o lkdtm-$(CONFIG_LKDTM) += lkdtm_bugs.o diff --git a/drivers/misc/cardreader/Kconfig b/drivers/misc/cardreader/Kconfig new file mode 100644 index 0000000..e7d835a --- /dev/null +++ b/drivers/misc/cardreader/Kconfig @@ -0,0 +1,20 @@ +config MISC_RTSX_PCI + tristate "Realtek PCI-E card reader" + depends on PCI + select MFD_CORE + help + This supports for Realtek PCI-Express card reader including rts5209, + rts5227, rts522A, rts5229, rts5249, rts524A, rts525A, rtl8411. + Realtek card readers support access to many types of memory cards, + such as Memory Stick, Memory Stick Pro, Secure Digital and + MultiMediaCard. + +config MISC_RTSX_USB + tristate "Realtek USB card reader" + depends on USB + select MFD_CORE + help + Select this option to get support for Realtek USB 2.0 card readers + including RTS5129, RTS5139, RTS5179 and RTS5170. + Realtek card reader supports access to many types of memory cards, + such as Memory Stick Pro, Secure Digital and MultiMediaCard. diff --git a/drivers/misc/cardreader/Makefile b/drivers/misc/cardreader/Makefile new file mode 100644 index 0000000..78337b2 --- /dev/null +++ b/drivers/misc/cardreader/Makefile @@ -0,0 +1,4 @@ +rtsx_pci-objs := rtsx_pcr.o rts5209.o rts5229.o rtl8411.o rts5227.o +rts5249.o + +obj-$(CONFIG_MISC_RTSX_PCI) += rtsx_pci.o +obj-$(CONFIG_MISC_RTSX_USB) += rtsx_usb.o diff --git a/drivers/mfd/rtl8411.c b/drivers/misc/cardreader/rtl8411.c similarity index 99% rename from drivers/mfd/rtl8411.c rename to drivers/misc/cardreader/rtl8411.c index b3ae659..434fd07 100644 --- a/drivers/mfd/rtl8411.c +++ b/drivers/misc/cardreader/rtl8411.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include "rtsx_pcr.h" diff --git a/drivers/mfd/rts5209.c b/drivers/misc/cardreader/rts5209.c similarity index 99% rename from drivers/mfd/rts5209.c rename to drivers/misc/cardreader/rts5209.c index b95beec..ce68c48 100644 --- a/drivers/mfd/rts5209.c +++ b/drivers/misc/cardreader/rts5209.c @@ -21,7 +21,7 @@ #include #include -#include +#include #include "rtsx_pcr.h" diff --git a/drivers/mfd/rts5227.c b/drivers/misc/cardreader/rts5227.c similarity index 99% rename from drivers/mfd/rts5227.c rename to drivers/misc/cardreader/rts5227.c index ff296a4..024dcba 100644 --- a/drivers/mfd/rts5227.c +++ b/drivers/misc/cardreader/rts5227.c @@ -22,7 +22,7 @@ #include #include -#include +#include #include "rtsx_pcr.h" diff --git a/drivers/mfd/rts5229.c b/drivers/misc/cardreader/rts5229.c similarity index 99% rename from drivers/mfd/rts5229.c rename to drivers/misc/cardreader/rts5229.c index 9ed9dc8..9119261 100644 --- a/drivers/mfd/rts5229.c +++ b/drivers/misc/cardreader/rts5229.c @@ -21,7 +21,7 @@ #include #include -#include +#include #include "rtsx_pcr.h" diff --git a/drivers/mfd/rts5249.c b/drivers/misc/cardreader/rts5249.c similarity index 99% rename from drivers/mfd/rts5249.c rename to drivers/misc/cardreader/rts5249.c index 7fcf37b..dbe013a 100644 --- a/drivers/mfd/rts5249.c +++ b/drivers/misc/cardreader/rts5249.c @@ -21,7 +21,7 @@ #include #include -#include +#include #include "rtsx_pcr.h" @@ -738,4 +738,3 @@ void rts525a_init_params(struct rtsx_pcr *pcr) pcr->reg_pm_ctrl3 = RTS524A_PM_CTRL3; pcr->ops = &rts525a_pcr_ops; } - diff --git a/drivers/mfd/rtsx_pcr.c b/drivers/misc/cardreader/rtsx_pcr.c similarity index 99% rename from drivers/mfd/rtsx_pcr.c rename to drivers/misc/cardreader/rtsx_pcr.c index 590fb9a..b60bd2a 100644 --- a/drivers/mfd/rtsx_pcr.c +++ b/drivers/misc/cardreader/rtsx_pcr.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include diff --git a/drivers/mfd/rtsx_pcr.h b/drivers/misc/cardreader/rtsx_pcr.h similarity index 99% rename from drivers/mfd/rtsx_pcr.h rename to drivers/misc/cardreader/rtsx_pcr.h index ec784e0..b0691c9 100644 --- a/drivers/mfd/rtsx_pcr.h +++ b/drivers/misc/cardreader/rtsx_pcr.h @@ -22,7 +22,7 @@ #ifndef __RTSX_PCR_H #define __RTSX_PCR_H -#include +#include #define MIN_DIV_N_PCR 80 #define MAX_DIV_N_PCR 208 diff --git a/drivers/mfd/rtsx_usb.c b/drivers/misc/cardreader/rtsx_usb.c similarity index 99% rename from drivers/mfd/rtsx_usb.c rename to drivers/misc/cardreader/rtsx_usb.c index 691dab7..e881209 100644 --- a/drivers/mfd/rtsx_usb.c +++ b/drivers/misc/cardreader/rtsx_usb.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include static int polling_pipe = 1; module_param(polling_pipe, int, S_IRUGO | S_IWUSR); diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index 8c15637..8b458b1 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig @@ -824,14 +824,14 @@ config MMC_USDHI6ROL0 config MMC_REALTEK_PCI tristate "Realtek PCI-E SD/MMC Card Interface Driver" - depends on MFD_RTSX_PCI + depends on MISC_RTSX_PCI help Say Y here to include driver code to support SD/MMC card interface of Realtek PCI-E card reader config MMC_REALTEK_USB tristate "Realtek USB SD/MMC Card Interface Driver" - depends on MFD_RTSX_USB + depends on MISC_RTSX_USB help Say Y here to include driver code to support SD/MMC card interface of Realtek RTS5129/39 series card reader diff --git a/drivers/mmc/host/rtsx_pci_sdmmc.c b/drivers/mmc/host/rtsx_pci_sdmmc.c index 0848dc0..30bd808 100644 --- a/drivers/mmc/host/rtsx_pci_sdmmc.c +++ b/drivers/mmc/host/rtsx_pci_sdmmc.c @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include struct realtek_pci_sdmmc { diff --git a/drivers/mmc/host/rtsx_usb_sdmmc.c b/drivers/mmc/host/rtsx_usb_sdmmc.c index 76da168..7842207 100644 --- a/drivers/mmc/host/rtsx_usb_sdmmc.c +++ b/drivers/mmc/host/rtsx_usb_sdmmc.c @@ -31,7 +31,7 @@ #include #include -#include +#include #include #if defined(CONFIG_LEDS_CLASS) || (defined(CONFIG_LEDS_CLASS_MODULE) && \ diff --git a/include/linux/mfd/rtsx_common.h b/include/linux/rtsx_common.h similarity index 100% rename from include/linux/mfd/rtsx_common.h rename to include/linux/rtsx_common.h diff --git a/include/linux/mfd/rtsx_pci.h b/include/linux/rtsx_pci.h similarity index 99% rename from include/linux/mfd/rtsx_pci.h rename to include/linux/rtsx_pci.h index a2a1318..82abac7 100644 --- a/include/linux/mfd/rtsx_pci.h +++ b/include/linux/rtsx_pci.h @@ -24,7 +24,7 @@ #include #include -#include +#include #define MAX_RW_REG_CNT 1024 diff --git a/include/linux/mfd/rtsx_usb.h b/include/linux/rtsx_usb.h similarity index 100% rename from include/linux/mfd/rtsx_usb.h rename to include/linux/rtsx_usb.h -- 1.9.1