[PATCH v3 0/4] Consolidate sdhci pltfm & OF drivers and get them self registered

Grant Likely grant.likely at secretlab.ca
Fri May 27 17:26:47 EST 2011


On Wed, May 25, 2011 at 07:01:50PM +0800, Shawn Guo wrote:
> Here are what the patch set does.
> 
> * Remove .probe and .remove hooks from sdhci-pltfm.c and make it be
>   a pure common helper function providers.
> * Add .probe and .remove hooks for sdhci pltfm drivers sdhci-cns3xxx,
>   sdhci-dove, sdhci-tegra, and sdhci-esdhc-imx to make them self
>   registered with calling helper functions created above.
> * Migrate the use of sdhci_of_host and sdhci_of_data to
>   sdhci_pltfm_host and sdhci_pltfm_data, so that OF version host and
>   data structure works can be saved, and pltfm version works for both
>   cases.
> * Add OF common helper stuff into sdhci-pltfm.c, and make OF version
>   sdhci drivers sdhci-of-esdhc and sdhci-of-hlwd become self
>   registered as well, so that sdhci-of-core.c and sdhci-of.h can be
>   removed.
> * Eliminate include/linux/mmc/sdhci-pltfm.h with moving stuff into
>   drivers/mmc/host/sdhci-pltfm.h.
> 
> And the benefits we gain from the changes are:
> 
> * Get the sdhci device driver follow the Linux trend that driver
>   makes the registration by its own.
> * sdhci-pltfm.c becomes simple and clean as it only has common helper
>   stuff there now.
> * All sdhci device specific things are going back its own driver.
> * The dt and non-dt drivers are consolidated to use the same pair of
>   .probe and .remove hooks.

Hey Chris,

Any chance we can get this series into $NEXT_KERNEL?

Thanks,
g.

> 
> Changes since v2:
> * Drop imx mpc esdhc consolidation
> * Fix checkpatch errors
> * Add sdhci-of-core.c copyright into sdhci-pltfm.c
> 
> Changes since v1:
> * Rebase on cjb's mmc-next tree
> * Introduce helper function pair sdhci_pltfm_register and
>   sdhci_pltfm_unregister
> * Eliminate variable 'scratch' in .remove hook to make the code
>   look simple
> * Return ERR_PTR in sdhci_pltfm_init and use IS_ERR/PTR_ERR to check
>   return value in .probe hooks
> * Correct MODULE_AUTHOR statement
> * Split esdhc conlidation patch to ease reviewing
> 
> Shawn Guo (4):
>       mmc: sdhci: make sdhci-pltfm device drivers self registered
>       mmc: sdhci: eliminate sdhci_of_host and sdhci_of_data
>       mmc: sdhci: make sdhci-of device drivers self registered
>       mmc: sdhci: merge two sdhci-pltfm.h into one
> 
>  drivers/mmc/host/Kconfig           |   47 +++----
>  drivers/mmc/host/Makefile          |   18 +--
>  drivers/mmc/host/sdhci-cns3xxx.c   |   43 ++++++-
>  drivers/mmc/host/sdhci-dove.c      |   42 ++++++-
>  drivers/mmc/host/sdhci-esdhc-imx.c |  114 +++++++++++-----
>  drivers/mmc/host/sdhci-of-core.c   |  250 ---------------------------------
>  drivers/mmc/host/sdhci-of-esdhc.c  |   85 +++++++++---
>  drivers/mmc/host/sdhci-of-hlwd.c   |   66 ++++++++--
>  drivers/mmc/host/sdhci-of.h        |   42 ------
>  drivers/mmc/host/sdhci-pltfm.c     |  266 ++++++++++++++++++++----------------
>  drivers/mmc/host/sdhci-pltfm.h     |   39 +++++-
>  drivers/mmc/host/sdhci-tegra.c     |  116 +++++++++++-----
>  include/linux/mmc/sdhci-pltfm.h    |   35 -----
>  13 files changed, 578 insertions(+), 585 deletions(-)
> 
> Regards,
> Shawn
> 


More information about the devicetree-discuss mailing list