2008-08-08 09:55:51

by Ben Dooks

Subject: s3cmci: fix sparse errors from non-exported functions

Fix the following sparse errors by making the functions
static and fixing the check for host->base.

598:6: warning: symbol 's3cmci_dma_done_callback' was not declared. Should it be static?
744:6: warning: symbol 's3cmci_dma_setup' was not declared. Should it be static?
1209:20: warning: Using plain integer as NULL pointer

Signed-off-by: Ben Dooks <[email protected]>

Index: linux-2.6.27-rc2-quilt1/drivers/mmc/host/s3cmci.c
===================================================================
--- linux-2.6.27-rc2-quilt1.orig/drivers/mmc/host/s3cmci.c 2008-08-07 14:28:41.000000000 +0100
+++ linux-2.6.27-rc2-quilt1/drivers/mmc/host/s3cmci.c 2008-08-07 14:29:56.000000000 +0100
@@ -595,8 +595,9 @@ static irqreturn_t s3cmci_irq_cd(int irq
return IRQ_HANDLED;
}

-void s3cmci_dma_done_callback(struct s3c2410_dma_chan *dma_ch, void *buf_id,
- int size, enum s3c2410_dma_buffresult result)
+static void s3cmci_dma_done_callback(struct s3c2410_dma_chan *dma_ch,
+ void *buf_id, int size,
+ enum s3c2410_dma_buffresult result)
{
struct s3cmci_host *host = buf_id;
unsigned long iflags;
@@ -740,8 +741,8 @@ request_done:
mmc_request_done(host->mmc, mrq);
}

-
-void s3cmci_dma_setup(struct s3cmci_host *host, enum s3c2410_dmasrc source)
+static void s3cmci_dma_setup(struct s3cmci_host *host,
+ enum s3c2410_dmasrc source)
{
static enum s3c2410_dmasrc last_source = -1;
static int setup_ok;
@@ -1206,7 +1207,7 @@ static int __devinit s3cmci_probe(struct
}

host->base = ioremap(host->mem->start, RESSIZE(host->mem));
- if (host->base == 0) {
+ if (!host->base) {
dev_err(&pdev->dev, "failed to ioremap() io memory region.\n");
ret = -EINVAL;
goto probe_free_mem_region;

--
Ben ([email protected], http://www.fluff.org/)

'a smiley only costs 4 bytes'

2008-08-17 17:59:55

by Pierre Ossman

Subject: Re: s3cmci: fix sparse errors from non-exported functions

On Fri, 08 Aug 2008 10:55:41 +0100
Ben Dooks <[email protected]> wrote:

> Fix the following sparse errors by making the functions
> static and fixing the check for host->base.
>
> 598:6: warning: symbol 's3cmci_dma_done_callback' was not declared. Should it be static?
> 744:6: warning: symbol 's3cmci_dma_setup' was not declared. Should it be static?
> 1209:20: warning: Using plain integer as NULL pointer
>
> Signed-off-by: Ben Dooks <[email protected]>
>

Applied.
--
-- Pierre Ossman

Linux kernel, MMC maintainer http://www.kernel.org
rdesktop, core developer http://www.rdesktop.org

WARNING: This correspondence is being monitored by the
Swedish government. Make sure your server uses encryption
for SMTP traffic and consider using PGP for end-to-end
encryption.