Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 515033f9 authored by Anton Vorontsov's avatar Anton Vorontsov Committed by Linus Torvalds
Browse files

sdhci-pltfm: switch to module device table matching 



Sometimes want to place SoC-specific parts alongside with the generic
driver, and to do so, we have to switch the driver over to the module
device table matching.

Note that drivers/mmc/host/sdhci-pltfm.h is so far empty, but it'll hold
SoC-specific driver data handlers soon.

Signed-off-by: default avatarAnton Vorontsov <avorontsov@mvista.com>
Cc: Ben Dooks <ben@simtec.co.uk>
Cc: Richard R?jfors <richard.rojfors@pelagicore.com>
Cc: <linux-mmc@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 27151dc9

drivers/mmc/host/sdhci-pltfm.c

+13 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 


#include <linux/delay.h>

#include <linux/highmem.h>

#include <linux/mod_devicetable.h>

#include <linux/platform_device.h>



#include <linux/mmc/host.h>
@@ -32,6 +33,7 @@ 
#include <linux/sdhci-pltfm.h>



#include "sdhci.h"

#include "sdhci-pltfm.h"



/*****************************************************************************\

 *                                                                           *
@@ -51,10 +53,14 @@ static struct sdhci_ops sdhci_pltfm_ops = { 
static int __devinit sdhci_pltfm_probe(struct platform_device *pdev)

{

	struct sdhci_pltfm_data *pdata = pdev->dev.platform_data;

	const struct platform_device_id *platid = platform_get_device_id(pdev);

	struct sdhci_host *host;

	struct resource *iomem;

	int ret;



	if (!pdata && platid && platid->driver_data)

		pdata = (void *)platid->driver_data;



	iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!iomem) {

		ret = -ENOMEM;
@@ -150,6 +156,12 @@ static int __devexit sdhci_pltfm_remove(struct platform_device *pdev) 
	return 0;

}



static const struct platform_device_id sdhci_pltfm_ids[] = {

	{ "sdhci", },

	{ },

};

MODULE_DEVICE_TABLE(platform, sdhci_pltfm_ids);



static struct platform_driver sdhci_pltfm_driver = {

	.driver = {

		.name	= "sdhci",
@@ -157,6 +169,7 @@ static struct platform_driver sdhci_pltfm_driver = { 
	},

	.probe		= sdhci_pltfm_probe,

	.remove		= __devexit_p(sdhci_pltfm_remove),

	.id_table	= sdhci_pltfm_ids,

};



/*****************************************************************************\
@@ -181,4 +194,3 @@ module_exit(sdhci_drv_exit); 
MODULE_DESCRIPTION("Secure Digital Host Controller Interface platform driver");

MODULE_AUTHOR("Mocean Laboratories <info@mocean-labs.com>");

MODULE_LICENSE("GPL v2");
 
MODULE_ALIAS("platform:sdhci");

drivers/mmc/host/sdhci-pltfm.h

0 → 100644
+14 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2010 MontaVista Software, LLC.

 *

 * Author: Anton Vorontsov <avorontsov@ru.mvista.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#ifndef _DRIVERS_MMC_SDHCI_PLTFM_H

#define _DRIVERS_MMC_SDHCI_PLTFM_H



#endif /* _DRIVERS_MMC_SDHCI_PLTFM_H */