leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mmc: sdhci-pci: Let devices define their own private data

Browse Source 
Let devices define their own private data to facilitate device-specific
operations. The size of the private structure is specified in the
sdhci_pci_fixes structure, then sdhci_pci_probe_slot() will allocate extra
space for it, and sdhci_pci_priv() can be used to get a reference to it.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Tested-by: Ludovic Desroches <ludovic.desroches@microchip.com>
This commit is contained in:
Adrian Hunter 2017-03-20 19:50:33 +02:00 committed by Ulf Hansson
parent d38dcad4e7
commit ac9f67b580
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/mmc/host/sdhci-pci-core.c
View File

@ -1830,6 +1830,7 @@ static struct sdhci_pci_slot *sdhci_pci_probe_slot(
struct sdhci_pci_slot *slot; struct sdhci_pci_slot *slot;
struct sdhci_host *host; struct sdhci_host *host;
int ret, bar = first_bar + slotno; int ret, bar = first_bar + slotno;
size_t priv_size = chip->fixes ? chip->fixes->priv_size : 0;
if (!(pci_resource_flags(pdev, bar) & IORESOURCE_MEM)) { if (!(pci_resource_flags(pdev, bar) & IORESOURCE_MEM)) {
dev_err(&pdev->dev, "BAR %d is not iomem. Aborting.\n", bar); dev_err(&pdev->dev, "BAR %d is not iomem. Aborting.\n", bar);
@ -1851,7 +1852,7 @@ static struct sdhci_pci_slot *sdhci_pci_probe_slot(
return ERR_PTR(-ENODEV); return ERR_PTR(-ENODEV);
} }
host = sdhci_alloc_host(&pdev->dev, sizeof(struct sdhci_pci_slot)); host = sdhci_alloc_host(&pdev->dev, sizeof(*slot) + priv_size);
if (IS_ERR(host)) { if (IS_ERR(host)) {
dev_err(&pdev->dev, "cannot allocate host\n"); dev_err(&pdev->dev, "cannot allocate host\n");
return ERR_CAST(host); return ERR_CAST(host);

7
drivers/mmc/host/sdhci-pci.h
View File

@ -70,6 +70,7 @@ struct sdhci_pci_fixes {
int (*resume) (struct sdhci_pci_chip *); int (*resume) (struct sdhci_pci_chip *);
const struct sdhci_ops *ops; const struct sdhci_ops *ops;
size_t priv_size;
}; };
struct sdhci_pci_slot { struct sdhci_pci_slot {
@ -89,6 +90,7 @@ struct sdhci_pci_slot {
struct mmc_card *card, struct mmc_card *card,
unsigned int max_dtr, int host_drv, unsigned int max_dtr, int host_drv,
int card_drv, int *drv_type); int card_drv, int *drv_type);
unsigned long private[0] ____cacheline_aligned;
}; };
struct sdhci_pci_chip { struct sdhci_pci_chip {
@ -105,4 +107,9 @@ struct sdhci_pci_chip {
struct sdhci_pci_slot *slots[MAX_SLOTS]; /* Pointers to host slots */ struct sdhci_pci_slot *slots[MAX_SLOTS]; /* Pointers to host slots */
}; };
static inline void *sdhci_pci_priv(struct sdhci_pci_slot *slot)
{
return (void *)slot->private;
}
#endif /* __SDHCI_PCI_H */ #endif /* __SDHCI_PCI_H */