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

Commit aaac1b47 authored Feb 28, 2007 by Pierre Ossman

mmc: Move core functions to subdir



Create a "core" subdirectory to house the central bus handling
functions.

Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>

parent b855885e

drivers/mmc/Makefile

+1 −6

Original line number	Diff line number	Diff line
		@@ -6,12 +6,7 @@ ifeq ($(CONFIG_MMC_DEBUG),y)
		EXTRA_CFLAGS += -DDEBUG
		endif

		#
		# Core
		#
		obj-$(CONFIG_MMC) += mmc_core.o
		mmc_core-y := mmc.o mmc_sysfs.o

		obj-$(CONFIG_MMC) += core/
		obj-$(CONFIG_MMC) += card/
		obj-$(CONFIG_MMC) += host/

drivers/mmc/core/Makefile

0 → 100644

+11 −0

Original line number	Diff line number	Diff line
		#
		# Makefile for the kernel mmc core.
		#

		ifeq ($(CONFIG_MMC_DEBUG),y)
		EXTRA_CFLAGS += -DDEBUG
		endif

		obj-$(CONFIG_MMC) += mmc_core.o
		mmc_core-y := core.o sysfs.o

drivers/mmc/mmc.c→drivers/mmc/core/core.c

+2 −2

Original line number	Diff line number	Diff line
		/*
		* linux/drivers/mmc/mmc.c
		* linux/drivers/mmc/core/core.c
		*
		* Copyright (C) 2003-2004 Russell King, All Rights Reserved.
		* SD support Copyright (C) 2004 Ian Molton, All Rights Reserved.
		@@ -25,7 +25,7 @@
		#include <linux/mmc/host.h>
		#include <linux/mmc/protocol.h>

		#include "mmc.h"
		#include "core.h"

		#define CMD_RETRIES 3

drivers/mmc/mmc.h→drivers/mmc/core/core.h

+3 −3

Original line number	Diff line number	Diff line
		/*
		* linux/drivers/mmc/mmc.h
		* linux/drivers/mmc/core/core.h
		*
		* Copyright (C) 2003 Russell King, All Rights Reserved.
		*
		@@ -7,8 +7,8 @@
		* it under the terms of the GNU General Public License version 2 as
		* published by the Free Software Foundation.
		*/
		#ifndef _MMC_H
		#define _MMC_H
		#ifndef _MMC_CORE_H
		#define _MMC_CORE_H
		/* core-internal functions */
		void mmc_init_card(struct mmc_card card, struct mmc_host host);
		int mmc_register_card(struct mmc_card *card);

drivers/mmc/mmc_sysfs.c→drivers/mmc/core/sysfs.c

+2 −2

Original line number	Diff line number	Diff line
		/*
		* linux/drivers/mmc/mmc_sysfs.c
		* linux/drivers/mmc/core/sysfs.c
		*
		* Copyright (C) 2003 Russell King, All Rights Reserved.
		*
		@@ -18,7 +18,7 @@
		#include <linux/mmc/card.h>
		#include <linux/mmc/host.h>

		#include "mmc.h"
		#include "core.h"

		#define dev_to_mmc_card(d) container_of(d, struct mmc_card, dev)
		#define to_mmc_driver(d) container_of(d, struct mmc_driver, drv)