lkml.org 
[lkml]   [2014]   [Feb]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.11 129/233] xtensa: xtfpga: fix definitions of platform devices
    Date
    3.11.10.4 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Max Filippov <jcmvbkbc@gmail.com>

    commit a558d99263936b8a67d4eff8918745a77bfd8c31 upstream.

    Remove __initdata attribute, as the devices may be used after init
    sections are freed.

    Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    arch/xtensa/platforms/xtfpga/setup.c | 12 ++++++------
    1 file changed, 6 insertions(+), 6 deletions(-)

    diff --git a/arch/xtensa/platforms/xtfpga/setup.c b/arch/xtensa/platforms/xtfpga/setup.c
    index 74bb74f..ea2d39d 100644
    --- a/arch/xtensa/platforms/xtfpga/setup.c
    +++ b/arch/xtensa/platforms/xtfpga/setup.c
    @@ -194,7 +194,7 @@ void __init platform_calibrate_ccount(void)
    * Ethernet -- OpenCores Ethernet MAC (ethoc driver)
    */

    -static struct resource ethoc_res[] __initdata = {
    +static struct resource ethoc_res[] = {
    [0] = { /* register space */
    .start = OETH_REGS_PADDR,
    .end = OETH_REGS_PADDR + OETH_REGS_SIZE - 1,
    @@ -212,7 +212,7 @@ static struct resource ethoc_res[] __initdata = {
    },
    };

    -static struct ethoc_platform_data ethoc_pdata __initdata = {
    +static struct ethoc_platform_data ethoc_pdata = {
    /*
    * The MAC address for these boards is 00:50:c2:13:6f:xx.
    * The last byte (here as zero) is read from the DIP switches on the
    @@ -222,7 +222,7 @@ static struct ethoc_platform_data ethoc_pdata __initdata = {
    .phy_id = -1,
    };

    -static struct platform_device ethoc_device __initdata = {
    +static struct platform_device ethoc_device = {
    .name = "ethoc",
    .id = -1,
    .num_resources = ARRAY_SIZE(ethoc_res),
    @@ -236,13 +236,13 @@ static struct platform_device ethoc_device __initdata = {
    * UART
    */

    -static struct resource serial_resource __initdata = {
    +static struct resource serial_resource = {
    .start = DUART16552_PADDR,
    .end = DUART16552_PADDR + 0x1f,
    .flags = IORESOURCE_MEM,
    };

    -static struct plat_serial8250_port serial_platform_data[] __initdata = {
    +static struct plat_serial8250_port serial_platform_data[] = {
    [0] = {
    .mapbase = DUART16552_PADDR,
    .irq = DUART16552_INTNUM,
    @@ -255,7 +255,7 @@ static struct plat_serial8250_port serial_platform_data[] __initdata = {
    { },
    };

    -static struct platform_device xtavnet_uart __initdata = {
    +static struct platform_device xtavnet_uart = {
    .name = "serial8250",
    .id = PLAT8250_DEV_PLATFORM,
    .dev = {
    --
    1.8.3.2


    \
     
     \ /
      Last update: 2014-02-07 14:41    [W:4.052 / U:0.168 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site