From: Kumar Gala <kumar.gala@freescale.com>
To: "Sylvain Munaut" <tnt@246tNt.com>
Cc: Tom Rini <trini@kernel.crashing.org>,
LKML <linux-kernel@vger.kernel.org>,
Embedded PPC Linux list <linuxppc-embedded@ozlabs.org>
Subject: Re: [PATCH 1/2] MPC52xx updates : sparse clean-ups
Date: Fri, 11 Mar 2005 14:12:02 -0600 [thread overview]
Message-ID: <be4da82f8d12e20b54050e15fd27df36@freescale.com> (raw)
In-Reply-To: <4231F9F9.5080506@246tNt.com>
On Mar 11, 2005, at 2:05 PM, Sylvain Munaut wrote:
> Hi Tom & all
>
> Here's some updates related to the Freescale MPC52xx. First some
> clean-ups for sparse warnings and then PCI support. I'd like to get
> theses approved & merged before I submit conversion to platform bus
> model.
>
> As usual, the patches can also be pulled of a bk repository :
> bk://tnt.bkbits.net/linux-2.5-mpc52xx-pending
>
> (note it's _NOT_ the same url as before even if it's close ;)
>
>
>
>
> =A0=A0=A0 Sylvain
>
> ---
>
> diff -Nru a/arch/ppc/syslib/mpc52xx_pic.c=20
> b/arch/ppc/syslib/mpc52xx_pic.c
> --- a/arch/ppc/syslib/mpc52xx_pic.c=A0=A0=A0=A0 2005-03-11 20:41:36 =
+01:00
> +++ b/arch/ppc/syslib/mpc52xx_pic.c=A0=A0=A0=A0 2005-03-11 20:41:36 =
+01:00
> @@ -33,8 +33,8 @@
> =A0#include <asm/mpc52xx.h>
>
>
>
> -static struct mpc52xx_intr *intr;
> -static struct mpc52xx_sdma *sdma;
> +static struct mpc52xx_intr __iomem *intr;
> +static struct mpc52xx_sdma __iomem *sdma;
>
> =A0static void
> =A0mpc52xx_ic_disable(unsigned int irq)
> @@ -173,7 +173,7 @@
> =A0=A0=A0=A0=A0=A0=A0 mpc52xx_ic_disable,=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=
=A0=A0 /* disable(irq) */
> =A0=A0=A0=A0=A0=A0=A0 mpc52xx_ic_disable_and_ack,=A0=A0=A0=A0 /* =
disable_and_ack(irq) */
> =A0=A0=A0=A0=A0=A0=A0 mpc52xx_ic_end,=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=
=A0=A0=A0=A0 /* end(irq) */
> -=A0=A0=A0=A0=A0=A0 0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=
=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 /* set_affinity(irq, cpumask)
> SMP. */
> +=A0=A0=A0=A0=A0=A0 NULL=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=
=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 /* set_affinity(irq, cpumask)
> SMP. */
> =A0};
It looks like others have moved to a C99 initialization style for=20
hw_interrupt_type, see syslib/ipic.c for an example.
> =A0void __init
> @@ -183,10 +183,8 @@
> =A0=A0=A0=A0=A0=A0=A0 u32 intr_ctrl;
>
> =A0=A0=A0=A0=A0=A0=A0 /* Remap the necessary zones */
> -=A0=A0=A0=A0=A0=A0 intr =3D (struct mpc52xx_intr *)
> -=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 ioremap(MPC52xx_INTR, =
sizeof(struct mpc52xx_intr));
> -=A0=A0=A0=A0=A0=A0 sdma =3D (struct mpc52xx_sdma *)
> -=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 ioremap(MPC52xx_SDMA, =
sizeof(struct mpc52xx_sdma));
> +=A0=A0=A0=A0=A0=A0 intr =3D ioremap(MPC52xx_INTR, sizeof(struct =
mpc52xx_intr));
> +=A0=A0=A0=A0=A0=A0 sdma =3D ioremap(MPC52xx_SDMA, sizeof(struct =
mpc52xx_sdma));
>
> =A0=A0=A0=A0=A0=A0=A0 if ((intr=3D=3DNULL) || (sdma=3D=3DNULL))
> =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 panic("Can't ioremap =
PIC/SDMA register for init_irq=20
> !");
> diff -Nru a/arch/ppc/syslib/mpc52xx_setup.c
> b/arch/ppc/syslib/mpc52xx_setup.c
> --- a/arch/ppc/syslib/mpc52xx_setup.c=A0=A0 2005-03-11 20:41:36 +01:00
> +++ b/arch/ppc/syslib/mpc52xx_setup.c=A0=A0 2005-03-11 20:41:36 =
+01:00
> @@ -39,7 +39,8 @@
> =A0void
> =A0mpc52xx_restart(char *cmd)
> =A0{
> -=A0=A0=A0=A0=A0=A0 struct mpc52xx_gpt* gpt0 =3D (struct =
mpc52xx_gpt*)=20
> MPC52xx_GPTx(0);
> +=A0=A0=A0=A0=A0=A0 struct mpc52xx_gpt __iomem *gpt0 =3D
> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 (struct mpc52xx_gpt =
__iomem *) MPC52xx_GPTx(0);
>
> =A0=A0=A0=A0=A0=A0=A0 local_irq_disable();
>
> @@ -102,7 +103,7 @@
> =A0#endif
>
> =A0static void
> -mpc52xx_psc_putc(struct mpc52xx_psc * psc, unsigned char c)
> +mpc52xx_psc_putc(struct mpc52xx_psc __iomem *psc, unsigned char c)
> =A0{
> =A0=A0=A0=A0=A0=A0=A0 while (!(in_be16(&psc->mpc52xx_psc_status) &
> =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 =
MPC52xx_PSC_SR_TXRDY));
> @@ -112,8 +113,9 @@
> =A0void
> =A0mpc52xx_progress(char *s, unsigned short hex)
> =A0{
> -=A0=A0=A0=A0=A0=A0 struct mpc52xx_psc *psc =3D (struct mpc52xx_psc=20=
> *)MPC52xx_CONSOLE;
> =A0=A0=A0=A0=A0=A0=A0 char c;
> +=A0=A0=A0=A0=A0=A0 struct mpc52xx_psc __iomem *psc =3D
> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 (struct mpc52xx_psc =
__iomem *)MPC52xx_CONSOLE;
>
> =A0=A0=A0=A0=A0=A0=A0 while ((c =3D *s++) !=3D 0) {
> =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 if (c =3D=3D '\n')
> @@ -138,11 +140,11 @@
> =A0=A0=A0=A0=A0=A0=A0=A0 * else get size from sdram config registers
> =A0=A0=A0=A0=A0=A0=A0=A0 */
> =A0=A0=A0=A0=A0=A0=A0 if (ramsize =3D=3D 0) {
> -=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 struct mpc52xx_mmap_ctl =
*mmap_ctl;
> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 struct mpc52xx_mmap_ctl =
__iomem *mmap_ctl;
> =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 u32 sdram_config_0, =
sdram_config_1;
>
> =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 /* Temp BAT2 mapping =
active when this is called ! */
> -=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 mmap_ctl =3D (struct =
mpc52xx_mmap_ctl*)=20
> MPC52xx_MMAP_CTL;
> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 mmap_ctl =3D (struct =
mpc52xx_mmap_ctl __iomem *)
> MPC52xx_MMAP_CTL;
>
> =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 sdram_config_0 =3D =
in_be32(&mmap_ctl->sdram0);
> =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 sdram_config_1 =3D =
in_be32(&mmap_ctl->sdram1);
> @@ -169,13 +171,11 @@
> =A0=A0=A0=A0=A0=A0=A0 /* if bootloader didn't pass bus frequencies, =
calculate them=20
> */
> =A0=A0=A0=A0=A0=A0=A0 if (xlbfreq =3D=3D 0) {
> =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 /* Get RTC & Clock =
manager modules */
> -=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 struct mpc52xx_rtc *rtc;
> -=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 struct mpc52xx_cdm *cdm;
> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 struct mpc52xx_rtc =
__iomem *rtc;
> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 struct mpc52xx_cdm =
__iomem *cdm;
>
> -=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 rtc =3D (struct =
mpc52xx_rtc*)
> -=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 =
ioremap(MPC52xx_RTC, sizeof(struct=20
> mpc52xx_rtc));
> -=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 cdm =3D (struct =
mpc52xx_cdm*)
> -=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 =
ioremap(MPC52xx_CDM, sizeof(struct=20
> mpc52xx_cdm));
> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 rtc =3D =
ioremap(MPC52xx_RTC, sizeof(struct mpc52xx_rtc));
> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 cdm =3D =
ioremap(MPC52xx_CDM, sizeof(struct mpc52xx_cdm));
>
> =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 if ((rtc=3D=3DNULL) || =
(cdm=3D=3DNULL))
> =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 =
panic("Can't ioremap RTC/CDM while computing=20
> bus
> freq");
> @@ -212,8 +212,8 @@
> =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 __res.bi_pcifreq =3D =
pcifreq;
>
> =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 /* Release mapping */
> -=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 iounmap((void*)rtc);
> -=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 iounmap((void*)cdm);
> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 iounmap(rtc);
> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 iounmap(cdm);
> =A0=A0=A0=A0=A0=A0=A0 }
>
> =A0=A0=A0=A0=A0=A0=A0 divisor =3D 4;
> diff -Nru a/drivers/serial/mpc52xx_uart.c=20
> b/drivers/serial/mpc52xx_uart.c
> --- a/drivers/serial/mpc52xx_uart.c=A0=A0=A0=A0 2005-03-11 20:41:36 =
+01:00
> +++ b/drivers/serial/mpc52xx_uart.c=A0=A0=A0=A0 2005-03-11 20:41:36 =
+01:00
> @@ -86,7 +86,7 @@
> =A0=A0=A0=A0=A0=A0=A0=A0 *=A0=A0=A0=A0=A0=A0=A0 the console_init
> =A0=A0=A0=A0=A0=A0=A0=A0 */
>
> -#define PSC(port) ((struct mpc52xx_psc *)((port)->membase))
> +#define PSC(port) ((struct mpc52xx_psc __iomem *)((port)->membase))
>
>
>
> =A0/* Forward declaration of the interruption handling routine */
> @@ -190,7 +190,7 @@
> =A0static int
> =A0mpc52xx_uart_startup(struct uart_port *port)
> =A0{
> -=A0=A0=A0=A0=A0=A0 struct mpc52xx_psc *psc =3D PSC(port);
> +=A0=A0=A0=A0=A0=A0 struct mpc52xx_psc __iomem *psc =3D PSC(port);
>
> =A0=A0=A0=A0=A0=A0=A0 /* Reset/activate the port, clear and enable =
interrupts */
> =A0=A0=A0=A0=A0=A0=A0 out_8(&psc->command,MPC52xx_PSC_RST_RX);
> @@ -217,7 +217,7 @@
> =A0static void
> =A0mpc52xx_uart_shutdown(struct uart_port *port)
> =A0{
> -=A0=A0=A0=A0=A0=A0 struct mpc52xx_psc *psc =3D PSC(port);
> +=A0=A0=A0=A0=A0=A0 struct mpc52xx_psc __iomem *psc =3D PSC(port);
>
> =A0=A0=A0=A0=A0=A0=A0 /* Shut down the port, interrupt and all */
> =A0=A0=A0=A0=A0=A0=A0 out_8(&psc->command,MPC52xx_PSC_RST_RX);
> @@ -231,7 +231,7 @@
> =A0mpc52xx_uart_set_termios(struct uart_port *port, struct termios =
*new,
> =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=
=A0 struct termios *old)
> =A0{
> -=A0=A0=A0=A0=A0=A0 struct mpc52xx_psc *psc =3D PSC(port);
> +=A0=A0=A0=A0=A0=A0 struct mpc52xx_psc __iomem *psc =3D PSC(port);
> =A0=A0=A0=A0=A0=A0=A0 unsigned long flags;
> =A0=A0=A0=A0=A0=A0=A0 unsigned char mr1, mr2;
> =A0=A0=A0=A0=A0=A0=A0 unsigned short ctr;
> @@ -562,7 +562,7 @@
> =A0mpc52xx_console_get_options(struct uart_port *port,
> =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=
=A0=A0=A0=A0 int *baud, int *parity, int *bits, int=20
> *flow)
> =A0{
> -=A0=A0=A0=A0=A0=A0 struct mpc52xx_psc *psc =3D PSC(port);
> +=A0=A0=A0=A0=A0=A0 struct mpc52xx_psc __iomem *psc =3D PSC(port);
> =A0=A0=A0=A0=A0=A0=A0 unsigned char mr1;
>
> =A0=A0=A0=A0=A0=A0=A0 /* Read the mode registers */
> @@ -592,7 +592,7 @@
> =A0mpc52xx_console_write(struct console *co, const char *s, unsigned =
int
> count)
> =A0{
> =A0=A0=A0=A0=A0=A0=A0 struct uart_port *port =3D =
&mpc52xx_uart_ports[co->index];
> -=A0=A0=A0=A0=A0=A0 struct mpc52xx_psc *psc =3D PSC(port);
> +=A0=A0=A0=A0=A0=A0 struct mpc52xx_psc __iomem *psc =3D PSC(port);
> =A0=A0=A0=A0=A0=A0=A0 unsigned int i, j;
>
> =A0=A0=A0=A0=A0=A0=A0 /* Disable interrupts */
>
> _______________________________________________
> Linuxppc-embedded mailing list
> Linuxppc-embedded@ozlabs.org
> https://ozlabs.org/mailman/listinfo/linuxppc-embedded
WARNING: multiple messages have this Message-ID (diff)
From: Kumar Gala <kumar.gala@freescale.com>
To: "Sylvain Munaut" <tnt@246tNt.com>
Cc: "LKML" <linux-kernel@vger.kernel.org>,
"Tom Rini" <trini@kernel.crashing.org>,
"Embedded PPC Linux list" <linuxppc-embedded@ozlabs.org>
Subject: Re: [PATCH 1/2] MPC52xx updates : sparse clean-ups
Date: Fri, 11 Mar 2005 14:12:02 -0600 [thread overview]
Message-ID: <be4da82f8d12e20b54050e15fd27df36@freescale.com> (raw)
In-Reply-To: <4231F9F9.5080506@246tNt.com>
On Mar 11, 2005, at 2:05 PM, Sylvain Munaut wrote:
> Hi Tom & all
>
> Here's some updates related to the Freescale MPC52xx. First some
> clean-ups for sparse warnings and then PCI support. I'd like to get
> theses approved & merged before I submit conversion to platform bus
> model.
>
> As usual, the patches can also be pulled of a bk repository :
> bk://tnt.bkbits.net/linux-2.5-mpc52xx-pending
>
> (note it's _NOT_ the same url as before even if it's close ;)
>
>
>
>
> Sylvain
>
> ---
>
> diff -Nru a/arch/ppc/syslib/mpc52xx_pic.c
> b/arch/ppc/syslib/mpc52xx_pic.c
> --- a/arch/ppc/syslib/mpc52xx_pic.c 2005-03-11 20:41:36 +01:00
> +++ b/arch/ppc/syslib/mpc52xx_pic.c 2005-03-11 20:41:36 +01:00
> @@ -33,8 +33,8 @@
> #include <asm/mpc52xx.h>
>
>
>
> -static struct mpc52xx_intr *intr;
> -static struct mpc52xx_sdma *sdma;
> +static struct mpc52xx_intr __iomem *intr;
> +static struct mpc52xx_sdma __iomem *sdma;
>
> static void
> mpc52xx_ic_disable(unsigned int irq)
> @@ -173,7 +173,7 @@
> mpc52xx_ic_disable, /* disable(irq) */
> mpc52xx_ic_disable_and_ack, /* disable_and_ack(irq) */
> mpc52xx_ic_end, /* end(irq) */
> - 0 /* set_affinity(irq, cpumask)
> SMP. */
> + NULL /* set_affinity(irq, cpumask)
> SMP. */
> };
It looks like others have moved to a C99 initialization style for
hw_interrupt_type, see syslib/ipic.c for an example.
> void __init
> @@ -183,10 +183,8 @@
> u32 intr_ctrl;
>
> /* Remap the necessary zones */
> - intr = (struct mpc52xx_intr *)
> - ioremap(MPC52xx_INTR, sizeof(struct mpc52xx_intr));
> - sdma = (struct mpc52xx_sdma *)
> - ioremap(MPC52xx_SDMA, sizeof(struct mpc52xx_sdma));
> + intr = ioremap(MPC52xx_INTR, sizeof(struct mpc52xx_intr));
> + sdma = ioremap(MPC52xx_SDMA, sizeof(struct mpc52xx_sdma));
>
> if ((intr==NULL) || (sdma==NULL))
> panic("Can't ioremap PIC/SDMA register for init_irq
> !");
> diff -Nru a/arch/ppc/syslib/mpc52xx_setup.c
> b/arch/ppc/syslib/mpc52xx_setup.c
> --- a/arch/ppc/syslib/mpc52xx_setup.c 2005-03-11 20:41:36 +01:00
> +++ b/arch/ppc/syslib/mpc52xx_setup.c 2005-03-11 20:41:36 +01:00
> @@ -39,7 +39,8 @@
> void
> mpc52xx_restart(char *cmd)
> {
> - struct mpc52xx_gpt* gpt0 = (struct mpc52xx_gpt*)
> MPC52xx_GPTx(0);
> + struct mpc52xx_gpt __iomem *gpt0 =
> + (struct mpc52xx_gpt __iomem *) MPC52xx_GPTx(0);
>
> local_irq_disable();
>
> @@ -102,7 +103,7 @@
> #endif
>
> static void
> -mpc52xx_psc_putc(struct mpc52xx_psc * psc, unsigned char c)
> +mpc52xx_psc_putc(struct mpc52xx_psc __iomem *psc, unsigned char c)
> {
> while (!(in_be16(&psc->mpc52xx_psc_status) &
> MPC52xx_PSC_SR_TXRDY));
> @@ -112,8 +113,9 @@
> void
> mpc52xx_progress(char *s, unsigned short hex)
> {
> - struct mpc52xx_psc *psc = (struct mpc52xx_psc
> *)MPC52xx_CONSOLE;
> char c;
> + struct mpc52xx_psc __iomem *psc =
> + (struct mpc52xx_psc __iomem *)MPC52xx_CONSOLE;
>
> while ((c = *s++) != 0) {
> if (c == '\n')
> @@ -138,11 +140,11 @@
> * else get size from sdram config registers
> */
> if (ramsize == 0) {
> - struct mpc52xx_mmap_ctl *mmap_ctl;
> + struct mpc52xx_mmap_ctl __iomem *mmap_ctl;
> u32 sdram_config_0, sdram_config_1;
>
> /* Temp BAT2 mapping active when this is called ! */
> - mmap_ctl = (struct mpc52xx_mmap_ctl*)
> MPC52xx_MMAP_CTL;
> + mmap_ctl = (struct mpc52xx_mmap_ctl __iomem *)
> MPC52xx_MMAP_CTL;
>
> sdram_config_0 = in_be32(&mmap_ctl->sdram0);
> sdram_config_1 = in_be32(&mmap_ctl->sdram1);
> @@ -169,13 +171,11 @@
> /* if bootloader didn't pass bus frequencies, calculate them
> */
> if (xlbfreq == 0) {
> /* Get RTC & Clock manager modules */
> - struct mpc52xx_rtc *rtc;
> - struct mpc52xx_cdm *cdm;
> + struct mpc52xx_rtc __iomem *rtc;
> + struct mpc52xx_cdm __iomem *cdm;
>
> - rtc = (struct mpc52xx_rtc*)
> - ioremap(MPC52xx_RTC, sizeof(struct
> mpc52xx_rtc));
> - cdm = (struct mpc52xx_cdm*)
> - ioremap(MPC52xx_CDM, sizeof(struct
> mpc52xx_cdm));
> + rtc = ioremap(MPC52xx_RTC, sizeof(struct mpc52xx_rtc));
> + cdm = ioremap(MPC52xx_CDM, sizeof(struct mpc52xx_cdm));
>
> if ((rtc==NULL) || (cdm==NULL))
> panic("Can't ioremap RTC/CDM while computing
> bus
> freq");
> @@ -212,8 +212,8 @@
> __res.bi_pcifreq = pcifreq;
>
> /* Release mapping */
> - iounmap((void*)rtc);
> - iounmap((void*)cdm);
> + iounmap(rtc);
> + iounmap(cdm);
> }
>
> divisor = 4;
> diff -Nru a/drivers/serial/mpc52xx_uart.c
> b/drivers/serial/mpc52xx_uart.c
> --- a/drivers/serial/mpc52xx_uart.c 2005-03-11 20:41:36 +01:00
> +++ b/drivers/serial/mpc52xx_uart.c 2005-03-11 20:41:36 +01:00
> @@ -86,7 +86,7 @@
> * the console_init
> */
>
> -#define PSC(port) ((struct mpc52xx_psc *)((port)->membase))
> +#define PSC(port) ((struct mpc52xx_psc __iomem *)((port)->membase))
>
>
>
> /* Forward declaration of the interruption handling routine */
> @@ -190,7 +190,7 @@
> static int
> mpc52xx_uart_startup(struct uart_port *port)
> {
> - struct mpc52xx_psc *psc = PSC(port);
> + struct mpc52xx_psc __iomem *psc = PSC(port);
>
> /* Reset/activate the port, clear and enable interrupts */
> out_8(&psc->command,MPC52xx_PSC_RST_RX);
> @@ -217,7 +217,7 @@
> static void
> mpc52xx_uart_shutdown(struct uart_port *port)
> {
> - struct mpc52xx_psc *psc = PSC(port);
> + struct mpc52xx_psc __iomem *psc = PSC(port);
>
> /* Shut down the port, interrupt and all */
> out_8(&psc->command,MPC52xx_PSC_RST_RX);
> @@ -231,7 +231,7 @@
> mpc52xx_uart_set_termios(struct uart_port *port, struct termios *new,
> struct termios *old)
> {
> - struct mpc52xx_psc *psc = PSC(port);
> + struct mpc52xx_psc __iomem *psc = PSC(port);
> unsigned long flags;
> unsigned char mr1, mr2;
> unsigned short ctr;
> @@ -562,7 +562,7 @@
> mpc52xx_console_get_options(struct uart_port *port,
> int *baud, int *parity, int *bits, int
> *flow)
> {
> - struct mpc52xx_psc *psc = PSC(port);
> + struct mpc52xx_psc __iomem *psc = PSC(port);
> unsigned char mr1;
>
> /* Read the mode registers */
> @@ -592,7 +592,7 @@
> mpc52xx_console_write(struct console *co, const char *s, unsigned int
> count)
> {
> struct uart_port *port = &mpc52xx_uart_ports[co->index];
> - struct mpc52xx_psc *psc = PSC(port);
> + struct mpc52xx_psc __iomem *psc = PSC(port);
> unsigned int i, j;
>
> /* Disable interrupts */
>
> _______________________________________________
> Linuxppc-embedded mailing list
> Linuxppc-embedded@ozlabs.org
> https://ozlabs.org/mailman/listinfo/linuxppc-embedded
next prev parent reply other threads:[~2005-03-11 20:12 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-03-11 20:05 [PATCH 1/2] MPC52xx updates : sparse clean-ups Sylvain Munaut
2005-03-11 20:08 ` [PATCH 2/2] MPC52xx updates : PCI Support Sylvain Munaut
2005-03-11 20:08 ` Sylvain Munaut
2005-03-11 20:48 ` Dale Farnsworth
2005-03-11 21:06 ` Sylvain Munaut
2005-03-11 20:12 ` Kumar Gala [this message]
2005-03-11 20:12 ` [PATCH 1/2] MPC52xx updates : sparse clean-ups Kumar Gala
2005-03-11 20:47 ` Sylvain Munaut
2005-03-11 21:00 ` Tom Rini
2005-03-11 21:00 ` Tom Rini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=be4da82f8d12e20b54050e15fd27df36@freescale.com \
--to=kumar.gala@freescale.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-embedded@ozlabs.org \
--cc=tnt@246tNt.com \
--cc=trini@kernel.crashing.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.