Skip to content

Commit

Permalink
[ARM] 4956/1: Scoop: sparse cleanup
Browse files Browse the repository at this point in the history
Cleanup most errors errors reported by sparse:
declare IO space as __iomem,
use %p for address printing
make functions static
Use __devinit instead of __init for scoop_init
Make scoop_remove __devexit and use __devexit_p for referencing it.

Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
Acked-by: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Dmitry Baryshkov authored and Russell King committed Apr 10, 2008
1 parent 05dda97 commit 2f8c514
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions arch/arm/common/scoop.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@
struct scoop_pcmcia_config *platform_scoop_config;
EXPORT_SYMBOL(platform_scoop_config);

#define SCOOP_REG(d,adr) (*(volatile unsigned short*)(d +(adr)))
#define SCOOP_REG(d,adr) (*(volatile __iomem unsigned short*)(d +(adr)))

struct scoop_dev {
void *base;
void __iomem *base;
spinlock_t scoop_lock;
unsigned short suspend_clr;
unsigned short suspend_set;
Expand Down Expand Up @@ -135,7 +135,7 @@ static int scoop_resume(struct platform_device *dev)
#define scoop_resume NULL
#endif

int __init scoop_probe(struct platform_device *pdev)
static int __devinit scoop_probe(struct platform_device *pdev)
{
struct scoop_dev *devptr;
struct scoop_config *inf;
Expand All @@ -160,7 +160,7 @@ int __init scoop_probe(struct platform_device *pdev)

platform_set_drvdata(pdev, devptr);

printk("Sharp Scoop Device found at 0x%08x -> 0x%08x\n",(unsigned int)mem->start,(unsigned int)devptr->base);
printk("Sharp Scoop Device found at 0x%08x -> 0x%8p\n",(unsigned int)mem->start, devptr->base);

SCOOP_REG(devptr->base, SCOOP_MCR) = 0x0140;
reset_scoop(&pdev->dev);
Expand All @@ -174,7 +174,7 @@ int __init scoop_probe(struct platform_device *pdev)
return 0;
}

static int scoop_remove(struct platform_device *pdev)
static int __devexit scoop_remove(struct platform_device *pdev)
{
struct scoop_dev *sdev = platform_get_drvdata(pdev);
if (sdev) {
Expand All @@ -187,15 +187,15 @@ static int scoop_remove(struct platform_device *pdev)

static struct platform_driver scoop_driver = {
.probe = scoop_probe,
.remove = scoop_remove,
.remove = __devexit_p(scoop_remove),
.suspend = scoop_suspend,
.resume = scoop_resume,
.driver = {
.name = "sharp-scoop",
},
};

int __init scoop_init(void)
static int __init scoop_init(void)
{
return platform_driver_register(&scoop_driver);
}
Expand Down

0 comments on commit 2f8c514

Please sign in to comment.