On Tue, Sep 15, 2020 at 11:27:50AM +0800, Xu Yilun wrote:
> In order to support MODULE_DEVICE_TABLE() for dfl device driver, this
> patch moves struct dfl_device_id to mod_devicetable.h
>
> Signed-off-by: Xu Yilun <yilun...@intel.com>
> Signed-off-by: Wu Hao <hao...@intel.com>
> Signed-off-by: Matthew Gerlach <matthew.gerl...@linux.intel.com>
> Signed-off-by: Russ Weight <russell.h.wei...@intel.com>
> Reviewed-by: Tom Rix <t...@redhat.com>
> Acked-by: Wu Hao <hao...@intel.com>
> ---
> v2: fix the order for the header file
> ---
> drivers/fpga/dfl.h | 13 +------------
> include/linux/mod_devicetable.h | 12 ++++++++++++
> 2 files changed, 13 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/fpga/dfl.h b/drivers/fpga/dfl.h
> index 5dc758f..3c69596 100644
> --- a/drivers/fpga/dfl.h
> +++ b/drivers/fpga/dfl.h
> @@ -22,6 +22,7 @@
> #include <linux/interrupt.h>
> #include <linux/iopoll.h>
> #include <linux/io-64-nonatomic-lo-hi.h>
> +#include <linux/mod_devicetable.h>
> #include <linux/platform_device.h>
> #include <linux/slab.h>
> #include <linux/uuid.h>
> @@ -526,18 +527,6 @@ enum dfl_id_type {
> };
>
> /**
> - * struct dfl_device_id - dfl device identifier
> - * @type: contains 4 bits DFL FIU type of the device. See enum dfl_id_type.
> - * @feature_id: contains 12 bits feature identifier local to its DFL FIU
> type.
> - * @driver_data: driver specific data.
> - */
> -struct dfl_device_id {
> - u8 type;
> - u16 feature_id;
> - unsigned long driver_data;
> -};
> -
> -/**
> * struct dfl_device - represent an dfl device on dfl bus
> *
> * @dev: generic device interface.
> diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
> index 5b08a47..407d8dc 100644
> --- a/include/linux/mod_devicetable.h
> +++ b/include/linux/mod_devicetable.h
> @@ -838,4 +838,16 @@ struct mhi_device_id {
> kernel_ulong_t driver_data;
> };
>
> +/**
> + * struct dfl_device_id - dfl device identifier
> + * @type: contains 4 bits DFL FIU type of the device. See enum dfl_id_type.
> + * @feature_id: contains 12 bits feature identifier local to its DFL FIU
> type.
> + * @driver_data: driver specific data.
> + */
> +struct dfl_device_id {
> + __u8 type;
> + __u16 feature_id;
> + kernel_ulong_t driver_data;
> +};
> +
> #endif /* LINUX_MOD_DEVICETABLE_H */
> --
> 2.7.4
>
Applied to for-next,
Thanks
