From mboxrd@z Thu Jan 1 00:00:00 1970 From: Randy Dunlap Subject: [PATCH -next] mmc: cb710 cleanups Date: Fri, 05 Jun 2009 11:03:05 -0700 Message-ID: <4A295DD9.2050301@oracle.com> References: <20090605164104.3cebe18d.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-path: Received: from rcsinet11.oracle.com ([148.87.113.123]:33624 "EHLO rgminet11.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754395AbZFESAE (ORCPT ); Fri, 5 Jun 2009 14:00:04 -0400 In-Reply-To: <20090605164104.3cebe18d.sfr@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: linux-next@vger.kernel.org, LKML , mirq-linux@rere.qmqm.pl, Pierre Ossman From: Randy Dunlap - don't define DEBUG, just use CONFIG_CB710_DEBUG or CONFIG_MMC_DEBUG - fix printk format warnings In file included from drivers/mmc/host/cb710-mmc.h:13, from drivers/mmc/host/cb710-mmc.c:15: include/linux/cb710.h:14:1: warning: "DEBUG" redefined : warning: this is the location of the previous definition drivers/mmc/host/cb710-mmc.c:222: warning: format '%d' expects type 'int', but argument 4 has type 'size_t' drivers/mmc/host/cb710-mmc.c:222: warning: format '%d' expects type 'int', but argument 6 has type 'size_t' Signed-off-by: Randy Dunlap Cc: mirq-linux@rere.qmqm.pl Cc: Pierre Ossman --- drivers/mmc/host/cb710-mmc.c | 2 +- include/linux/cb710.h | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) --- linux-next-20090605.orig/drivers/mmc/host/cb710-mmc.c +++ linux-next-20090605/drivers/mmc/host/cb710-mmc.c @@ -219,7 +219,7 @@ static void cb710_mmc_set_transfer_size( cb710_write_port_32(slot, CB710_MMC_TRANSFER_SIZE_PORT, ((count - 1) << 16)|(blocksize - 1)); - dev_vdbg(cb710_slot_dev(slot), "set up for %d block%s of %d bytes\n", + dev_vdbg(cb710_slot_dev(slot), "set up for %zu block%s of %zu bytes\n", count, count == 1 ? "" : "s", blocksize); } --- linux-next-20090605.orig/include/linux/cb710.h +++ linux-next-20090605/include/linux/cb710.h @@ -10,10 +10,6 @@ #ifndef LINUX_CB710_DRIVER_H #define LINUX_CB710_DRIVER_H -#ifdef CONFIG_CB710_DEBUG -#define DEBUG -#endif - /* verify assumptions on platform_device framework */ #define CONFIG_CB710_DEBUG_ASSUMPTIONS -- ~Randy LPC 2009, Sept. 23-25, Portland, Oregon http://linuxplumbersconf.org/2009/