CINXE.COM

<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>LKML: Pavel Machek: Fix u32 vs. pm_message_t in arm</title><link href="/css/message.css" rel="stylesheet" type="text/css" /><link href="/css/wrap.css" rel="alternate stylesheet" type="text/css" title="wrap" /><link href="/css/nowrap.css" rel="stylesheet" type="text/css" title="nowrap" /><link href="/favicon.ico" rel="shortcut icon" /><script src="/js/simple-calendar.js" type="text/javascript"></script><script src="/js/styleswitcher.js" type="text/javascript"></script><link rel="alternate" type="application/rss+xml" title="lkml.org : last 100 messages" href="/rss.php" /><link rel="alternate" type="application/rss+xml" title="lkml.org : last messages by Pavel Machek" href="/groupie.php?aid=26639" /><script> var _paq = window._paq = window._paq || []; /* tracker methods like "setCustomDimension" should be called before "trackPageView" */ _paq.push(["setDoNotTrack", true]); _paq.push(["disableCookies"]); _paq.push(['trackPageView']); _paq.push(['enableLinkTracking']); (function() { var u="//m.lkml.org/"; _paq.push(['setTrackerUrl', u+'matomo.php']); _paq.push(['setSiteId', '1']); var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s); })(); </script></head><body onload="es.jasper.simpleCalendar.init();" itemscope="itemscope" itemtype="http://schema.org/BlogPosting"><table border="0" cellpadding="0" cellspacing="0"><tr><td width="180" align="center"><a href="/"><img style="border:0;width:135px;height:32px" src="/images/toprowlk.gif" alt="lkml.org" /></a></td><td width="32">聽</td><td class="nb"><div><a class="nb" href="/lkml"> [lkml]</a> 聽 <a class="nb" href="/lkml/2005"> [2005]</a> 聽 <a class="nb" href="/lkml/2005/3"> [Mar]</a> 聽 <a class="nb" href="/lkml/2005/3/29"> [29]</a> 聽 <a class="nb" href="/lkml/last100"> [last100]</a> 聽 <a href="/rss.php"><img src="/images/rss-or.gif" border="0" alt="RSS Feed" /></a></div><div>Views: <a href="#" class="nowrap" onclick="setActiveStyleSheet('wrap');return false;">[wrap]</a><a href="#" class="wrap" onclick="setActiveStyleSheet('nowrap');return false;">[no wrap]</a> 聽 <a class="nb" href="/lkml/mheaders/2005/3/29/215" onclick="this.href='/lkml/headers'+'/2005/3/29/215';">[headers]</a>聽 <a href="/lkml/bounce/2005/3/29/215">[forward]</a>聽 </div></td><td width="32">聽</td></tr><tr><td valign="top"><div class="es-jasper-simpleCalendar" baseurl="/lkml/"></div><div class="threadlist">Messages in this thread</div><ul class="threadlist"><li class="root"><a href="/lkml/2005/3/29/215">First message in thread</a></li><li class="origin"><a href="/lkml/2005/4/3/38">Pavel Machek</a><ul><li><a href="/lkml/2005/4/3/38">Russell King</a></li><li><a href="/lkml/2005/4/3/50">Russell King</a><ul><li><a href="/lkml/2005/4/3/51">Pavel Machek</a><ul><li><a href="/lkml/2005/4/4/128">Russell King</a><ul><li><a href="/lkml/2005/4/4/133">Linus Torvalds</a></li></ul></li></ul></li></ul></li></ul></li></ul><div class="threadlist">Patch in this message</div><ul class="threadlist"><li><a href="/lkml/diff/2005/3/29/215/1">Get diff 1</a></li></ul></td><td width="32" rowspan="2" class="c" valign="top"><img src="/images/icornerl.gif" width="32" height="32" alt="/" /></td><td class="c" rowspan="2" valign="top" style="padding-top: 1em"><table><tr><td><table><tr><td class="lp">Date</td><td class="rp" itemprop="datePublished">Tue, 29 Mar 2005 21:15:43 +0200</td></tr><tr><td class="lp">From</td><td class="rp" itemprop="author">Pavel Machek <></td></tr><tr><td class="lp">Subject</td><td class="rp" itemprop="name">Fix u32 vs. pm_message_t in arm</td></tr></table></td><td></td></tr></table><pre itemprop="articleBody">Hi! This fixes u32 vs. pm_message_t confusion in arm. I was not able to even compile it, but it should not cause any problems. Please apply, Pavel --- clean/arch/arm/common/sa1111.c 2005-02-28 00:50:39.000000000 +0100 +++ linux/arch/arm/common/sa1111.c 2005-03-27 23:33:55.000000000 +0200 @@ -800,7 +800,7 @@ #ifdef CONFIG_PM -static int sa1111_suspend(struct device *dev, u32 state, u32 level) +static int sa1111_suspend(struct device *dev, pm_message_t state, u32 level) { struct sa1111 *sachip = dev_get_drvdata(dev); struct sa1111_save_data *save; --- clean/arch/arm/kernel/time.c 2005-01-22 21:24:50.000000000 +0100 +++ linux/arch/arm/kernel/time.c 2005-03-27 23:33:55.000000000 +0200 @@ -178,7 +178,7 @@ static SYSDEV_ATTR(event, 0200, NULL, leds_store); -static int leds_suspend(struct sys_device *dev, u32 state) +static int leds_suspend(struct sys_device *dev, pm_message_t state) { leds_event(led_stop); return 0; @@ -351,7 +351,7 @@ } #ifdef CONFIG_PM -static int timer_suspend(struct sys_device *dev, u32 state) +static int timer_suspend(struct sys_device *dev, pm_message_t state) { struct sys_timer *timer = container_of(dev, struct sys_timer, dev); --- clean/arch/arm/mach-integrator/integrator_ap.c 2005-01-12 11:07:37.000000000 +0100 +++ linux/arch/arm/mach-integrator/integrator_ap.c 2005-03-27 23:33:55.000000000 +0200 @@ -137,7 +137,7 @@ #ifdef CONFIG_PM static unsigned long ic_irq_enable; -static int irq_suspend(struct sys_device *dev, u32 state) +static int irq_suspend(struct sys_device *dev, pm_message_t state) { ic_irq_enable = readl(VA_IC_BASE + IRQ_ENABLE); return 0; --- clean/arch/arm/mach-integrator/time.c 2005-02-28 00:50:39.000000000 +0100 +++ linux/arch/arm/mach-integrator/time.c 2005-03-27 23:33:55.000000000 +0200 @@ -158,7 +158,7 @@ static struct timespec rtc_delta; -static int rtc_suspend(struct amba_device *dev, u32 state) +static int rtc_suspend(struct amba_device *dev, pm_message_t state) { struct timespec rtc; --- clean/arch/arm/mach-pxa/corgi_ssp.c 2005-01-22 21:24:51.000000000 +0100 +++ linux/arch/arm/mach-pxa/corgi_ssp.c 2005-03-27 23:33:55.000000000 +0200 @@ -210,7 +210,7 @@ return 0; } -static int corgi_ssp_suspend(struct device *dev, u32 state, u32 level) +static int corgi_ssp_suspend(struct device *dev, pm_message_t state, u32 level) { if (level == SUSPEND_POWER_DOWN) { ssp_flush(&corgi_ssp_dev); --- clean/arch/arm/mach-s3c2410/dma.c 2005-03-19 00:31:04.000000000 +0100 +++ linux/arch/arm/mach-s3c2410/dma.c 2005-03-27 23:33:55.000000000 +0200 @@ -1092,7 +1092,7 @@ #ifdef CONFIG_PM -static int s3c2410_dma_suspend(struct sys_device *dev, u32 state) +static int s3c2410_dma_suspend(struct sys_device *dev, pm_message_t state) { s3c2410_dma_chan_t *cp = container_of(dev, s3c2410_dma_chan_t, dev); --- clean/arch/arm/mach-s3c2410/s3c2440.c 2005-03-19 00:31:04.000000000 +0100 +++ linux/arch/arm/mach-s3c2410/s3c2440.c 2005-03-27 23:33:55.000000000 +0200 @@ -159,7 +159,7 @@ SAVE_ITEM(S3C2440_GPJUP) }; -static int s3c2440_suspend(struct sys_device *dev, u32 state) +static int s3c2440_suspend(struct sys_device *dev, pm_message_t state) { s3c2410_pm_do_save(s3c2440_sleep, ARRAY_SIZE(s3c2440_sleep)); return 0; --- clean/arch/arm/mach-sa1100/irq.c 2004-03-11 18:10:36.000000000 +0100 +++ linux/arch/arm/mach-sa1100/irq.c 2005-03-27 23:33:55.000000000 +0200 @@ -218,7 +218,7 @@ unsigned int iccr; } sa1100irq_state; -static int sa1100irq_suspend(struct sys_device *dev, u32 state) +static int sa1100irq_suspend(struct sys_device *dev, pm_message_t state) { struct sa1100irq_state *st = &sa1100irq_state; --- clean/arch/arm/mach-sa1100/neponset.c 2005-03-19 00:31:04.000000000 +0100 +++ linux/arch/arm/mach-sa1100/neponset.c 2005-03-27 23:33:55.000000000 +0200 @@ -178,7 +178,7 @@ /* * LDM power management. */ -static int neponset_suspend(struct device *dev, u32 state, u32 level) +static int neponset_suspend(struct device *dev, pm_message_t state, u32 level) { /* * Save state. --- clean/arch/arm/oprofile/common.c 2005-02-14 14:12:15.000000000 +0100 +++ linux/arch/arm/oprofile/common.c 2005-03-27 23:33:55.000000000 +0200 @@ -26,7 +26,7 @@ static int pmu_create_files(struct super_block *, struct dentry *); #ifdef CONFIG_PM -static int pmu_suspend(struct sys_device *dev, u32 state) +static int pmu_suspend(struct sys_device *dev, pm_message_t state) { if (pmu_enabled) pmu_stop(); --- clean/include/asm-arm/arch-integrator/lm.h 2003-09-28 22:06:34.000000000 +0200 +++ linux/include/asm-arm/arch-integrator/lm.h 2005-03-27 23:34:31.000000000 +0200 @@ -10,7 +10,7 @@ struct device_driver drv; int (*probe)(struct lm_device *); void (*remove)(struct lm_device *); - int (*suspend)(struct lm_device *, u32); + int (*suspend)(struct lm_device *, pm_message_t); int (*resume)(struct lm_device *); }; --- clean/include/asm-arm/hardware/amba.h 2004-04-05 10:45:28.000000000 +0200 +++ linux/include/asm-arm/hardware/amba.h 2005-03-27 23:34:31.000000000 +0200 @@ -31,7 +31,7 @@ int (*probe)(struct amba_device *, void *); int (*remove)(struct amba_device *); void (*shutdown)(struct amba_device *); - int (*suspend)(struct amba_device *, u32); + int (*suspend)(struct amba_device *, pm_message_t); int (*resume)(struct amba_device *); struct amba_id *id_table; }; --- clean/include/asm-arm/hardware/locomo.h 2005-03-19 00:32:11.000000000 +0100 +++ linux/include/asm-arm/hardware/locomo.h 2005-03-27 23:34:31.000000000 +0200 @@ -181,7 +181,7 @@ unsigned int devid; int (*probe)(struct locomo_dev *); int (*remove)(struct locomo_dev *); - int (*suspend)(struct locomo_dev *, u32); + int (*suspend)(struct locomo_dev *, pm_message_t); int (*resume)(struct locomo_dev *); }; --- clean/include/asm-arm/hardware/sa1111.h 2005-02-28 00:50:44.000000000 +0100 +++ linux/include/asm-arm/hardware/sa1111.h 2005-03-27 23:34:31.000000000 +0200 @@ -567,7 +567,7 @@ unsigned int devid; int (*probe)(struct sa1111_dev *); int (*remove)(struct sa1111_dev *); - int (*suspend)(struct sa1111_dev *, u32); + int (*suspend)(struct sa1111_dev *, pm_message_t); int (*resume)(struct sa1111_dev *); }; -- People were complaining that M$ turns users into beta-testers... ...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl! - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at <a href="http://vger.kernel.org/majordomo-info.html">http://vger.kernel.org/majordomo-info.html</a> Please read the FAQ at <a href="http://www.tux.org/lkml/">http://www.tux.org/lkml/</a> </pre></td><td width="32" rowspan="2" class="c" valign="top"><img src="/images/icornerr.gif" width="32" height="32" alt="\" /></td></tr><tr><td align="right" valign="bottom"> 聽 </td></tr><tr><td align="right" valign="bottom">聽</td><td class="c" valign="bottom" style="padding-bottom: 0px"><img src="/images/bcornerl.gif" width="32" height="32" alt="\" /></td><td class="c">聽</td><td class="c" valign="bottom" style="padding-bottom: 0px"><img src="/images/bcornerr.gif" width="32" height="32" alt="/" /></td></tr><tr><td align="right" valign="top" colspan="2"> 聽 </td><td class="lm">Last update: 2005-04-06 13:31 聽聽 [from the cache] 漏2003-2020 <a href="http://blog.jasper.es/">Jasper Spaans</a>|hosted at <a href="https://www.digitalocean.com/?refcode=9a8e99d24cf9">Digital Ocean</a> and my Meterkast|<a href="http://blog.jasper.es/categories.html#lkml-ref">Read the blog</a></td><td>聽</td></tr></table><script language="javascript" src="/js/styleswitcher.js" type="text/javascript"></script></body></html>