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

Commit f12e0dd0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mmc-v4.15-rc2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc 

Pull MMC host fixes from Ulf Hansson:

 - s3mci: mark debug_regs[] as static

 - renesas_sdhi: Add MODULE_LICENSE

* tag 'mmc-v4.15-rc2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: s3mci: mark debug_regs[] as static
  mmc: renesas_sdhi: Add MODULE_LICENSE
parents 352ef571 2bd7b4aa

drivers/mmc/host/renesas_sdhi_core.c

+3 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/kernel.h>

#include <linux/clk.h>

#include <linux/slab.h>

#include <linux/module.h>

#include <linux/of_device.h>

#include <linux/platform_device.h>

#include <linux/mmc/host.h>
@@ -667,3 +668,5 @@ int renesas_sdhi_remove(struct platform_device *pdev) 
	return 0;

}

EXPORT_SYMBOL_GPL(renesas_sdhi_remove);



MODULE_LICENSE("GPL v2");

drivers/mmc/host/s3cmci.c

+4 −2
Original line number Diff line number Diff line
@@ -1424,7 +1424,9 @@ static const struct file_operations s3cmci_fops_state = { 
struct s3cmci_reg {

	unsigned short	addr;

	unsigned char	*name;

} debug_regs[] = {

};



static const struct s3cmci_reg debug_regs[] = {

	DBG_REG(CON),

	DBG_REG(PRE),

	DBG_REG(CMDARG),
@@ -1446,7 +1448,7 @@ struct s3cmci_reg { 
static int s3cmci_regs_show(struct seq_file *seq, void *v)

{

	struct s3cmci_host *host = seq->private;

	struct s3cmci_reg *rptr = debug_regs;

	const struct s3cmci_reg *rptr = debug_regs;



	for (; rptr->name; rptr++)

		seq_printf(seq, "SDI%s\t=0x%08x\n", rptr->name,