diff for duplicates of <20120409203651.GB6487@atomide.com> diff --git a/a/1.txt b/N1/1.txt index 910cd5c..0e4053b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -5,9 +5,9 @@ > > -static int __init > > +int __init -> > omap_mux_get_by_name(const char *muxname, -> > struct omap_mux_partition **found_partition, -> > struct omap_mux **found_mux) +> > ?omap_mux_get_by_name(const char *muxname, +> > ? ? ? ? ? ? ? ? ? ? ? ?struct omap_mux_partition **found_partition, +> > ? ? ? ? ? ? ? ? ? ? ? ?struct omap_mux **found_mux) This can now be one one line: @@ -15,28 +15,28 @@ int __init omap_mux_get_by_name(const char *muxname, ... -> > + u16 tx_mode, rx_mode; +> > + ? ? ? ? ? ? ? u16 tx_mode, rx_mode; > > + -> > + tx_mode = omap_mux_read(tx_partition, tx_mux->reg_offset); -> > + rx_mode = omap_mux_read(rx_partition, rx_mux->reg_offset); +> > + ? ? ? ? ? ? ? tx_mode = omap_mux_read(tx_partition, tx_mux->reg_offset); +> > + ? ? ? ? ? ? ? rx_mode = omap_mux_read(rx_partition, rx_mux->reg_offset); > > + -> > + if (!(rx_mode & 0x07) && !(tx_mode & 0x07)) { -> > + default_omap_uart_pads[0].name = rx_pad_name; -> > + default_omap_uart_pads[0].flags = -> > + OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP; -> > + default_omap_uart_pads[0].enable = OMAP_PIN_INPUT | -> > + OMAP_MUX_MODE0; -> > + default_omap_uart_pads[0].idle = OMAP_PIN_INPUT | -> > + OMAP_MUX_MODE0; +> > + ? ? ? ? ? ? ? if (!(rx_mode & 0x07) && !(tx_mode & 0x07)) { +> > + ? ? ? ? ? ? ? ? ? ? ? default_omap_uart_pads[0].name = rx_pad_name; +> > + ? ? ? ? ? ? ? ? ? ? ? default_omap_uart_pads[0].flags ?= +> > + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP; +> > + ? ? ? ? ? ? ? ? ? ? ? default_omap_uart_pads[0].enable = OMAP_PIN_INPUT | +> > + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? OMAP_MUX_MODE0; +> > + ? ? ? ? ? ? ? ? ? ? ? default_omap_uart_pads[0].idle = OMAP_PIN_INPUT | +> > + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? OMAP_MUX_MODE0; > > + -> > + default_omap_uart_pads[1].name = tx_pad_name; -> > + default_omap_uart_pads[1].enable = OMAP_PIN_OUTPUT | -> > + OMAP_MUX_MODE0; -> > + bdata->pads = default_omap_uart_pads; +> > + ? ? ? ? ? ? ? ? ? ? ? default_omap_uart_pads[1].name = tx_pad_name; +> > + ? ? ? ? ? ? ? ? ? ? ? default_omap_uart_pads[1].enable = OMAP_PIN_OUTPUT | +> > + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? OMAP_MUX_MODE0; +> > + ? ? ? ? ? ? ? ? ? ? ? bdata->pads = default_omap_uart_pads; > > You are assigning this variable to a structure on the stack. > -> > + bdata->pads_cnt = ARRAY_SIZE(default_omap_uart_pads); +> > + ? ? ? ? ? ? ? ? ? ? ? bdata->pads_cnt = ARRAY_SIZE(default_omap_uart_pads); Also, maybe make that into a separate function with comments added that we check that the default pins are muxed to uart rx and tx mode to start @@ -49,7 +49,3 @@ in uart rx/tx mode. Regards, Tony --- -To unsubscribe from this list: send the line "unsubscribe linux-omap" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index 7735c73..34a2578 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -6,16 +6,10 @@ "ref\020120406181556.GC15734@atomide.com\0" "ref\0CAMrsUdKs21qtrWX0i44fvm7U2JW0L=2NgmZBHAZGmwp03XFm6w@mail.gmail.com\0" "ref\0CA+Bv8XZgKg-Om9S=CcJEDWRan0pMZ_t1aCVT31q3REmcgLntBw@mail.gmail.com\0" - "From\0Tony Lindgren <tony@atomide.com>\0" - "Subject\0Re: [RESEND PATCH] ARM :OMAP2+: UART: Remove some of uart default pads\0" + "From\0tony@atomide.com (Tony Lindgren)\0" + "Subject\0[RESEND PATCH] ARM :OMAP2+: UART: Remove some of uart default pads\0" "Date\0Mon, 9 Apr 2012 13:36:51 -0700\0" - "To\0Russ Dill <russ.dill@gmail.com>\0" - "Cc\0Raja" - Govindraj <govindraj.raja@ti.com> - linux-omap@vger.kernel.org - linux-arm-kernel@lists.infradead.org - Felipe Balbi <balbi@ti.com> - " Kevin Hilman <khilman@ti.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "* Russ Dill <russ.dill@gmail.com> [120409 09:59]:\n" @@ -25,9 +19,9 @@ "\n" "> > -static int __init\n" "> > +int __init\n" - "> > \302\240omap_mux_get_by_name(const char *muxname,\n" - "> > \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240struct omap_mux_partition **found_partition,\n" - "> > \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240struct omap_mux **found_mux)\n" + "> > ?omap_mux_get_by_name(const char *muxname,\n" + "> > ? ? ? ? ? ? ? ? ? ? ? ?struct omap_mux_partition **found_partition,\n" + "> > ? ? ? ? ? ? ? ? ? ? ? ?struct omap_mux **found_mux)\n" "\n" "This can now be one one line:\n" "\n" @@ -35,28 +29,28 @@ "...\n" "\n" "\n" - "> > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 u16 tx_mode, rx_mode;\n" + "> > + ? ? ? ? ? ? ? u16 tx_mode, rx_mode;\n" "> > +\n" - "> > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 tx_mode = omap_mux_read(tx_partition, tx_mux->reg_offset);\n" - "> > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 rx_mode = omap_mux_read(rx_partition, rx_mux->reg_offset);\n" + "> > + ? ? ? ? ? ? ? tx_mode = omap_mux_read(tx_partition, tx_mux->reg_offset);\n" + "> > + ? ? ? ? ? ? ? rx_mode = omap_mux_read(rx_partition, rx_mux->reg_offset);\n" "> > +\n" - "> > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 if (!(rx_mode & 0x07) && !(tx_mode & 0x07)) {\n" - "> > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 default_omap_uart_pads[0].name = rx_pad_name;\n" - "> > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 default_omap_uart_pads[0].flags \302\240=\n" - "> > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP;\n" - "> > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 default_omap_uart_pads[0].enable = OMAP_PIN_INPUT |\n" - "> > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 OMAP_MUX_MODE0;\n" - "> > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 default_omap_uart_pads[0].idle = OMAP_PIN_INPUT |\n" - "> > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 OMAP_MUX_MODE0;\n" + "> > + ? ? ? ? ? ? ? if (!(rx_mode & 0x07) && !(tx_mode & 0x07)) {\n" + "> > + ? ? ? ? ? ? ? ? ? ? ? default_omap_uart_pads[0].name = rx_pad_name;\n" + "> > + ? ? ? ? ? ? ? ? ? ? ? default_omap_uart_pads[0].flags ?=\n" + "> > + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP;\n" + "> > + ? ? ? ? ? ? ? ? ? ? ? default_omap_uart_pads[0].enable = OMAP_PIN_INPUT |\n" + "> > + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? OMAP_MUX_MODE0;\n" + "> > + ? ? ? ? ? ? ? ? ? ? ? default_omap_uart_pads[0].idle = OMAP_PIN_INPUT |\n" + "> > + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? OMAP_MUX_MODE0;\n" "> > +\n" - "> > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 default_omap_uart_pads[1].name = tx_pad_name;\n" - "> > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 default_omap_uart_pads[1].enable = OMAP_PIN_OUTPUT |\n" - "> > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 OMAP_MUX_MODE0;\n" - "> > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 bdata->pads = default_omap_uart_pads;\n" + "> > + ? ? ? ? ? ? ? ? ? ? ? default_omap_uart_pads[1].name = tx_pad_name;\n" + "> > + ? ? ? ? ? ? ? ? ? ? ? default_omap_uart_pads[1].enable = OMAP_PIN_OUTPUT |\n" + "> > + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? OMAP_MUX_MODE0;\n" + "> > + ? ? ? ? ? ? ? ? ? ? ? bdata->pads = default_omap_uart_pads;\n" "> \n" "> You are assigning this variable to a structure on the stack.\n" "> \n" - "> > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 bdata->pads_cnt = ARRAY_SIZE(default_omap_uart_pads);\n" + "> > + ? ? ? ? ? ? ? ? ? ? ? bdata->pads_cnt = ARRAY_SIZE(default_omap_uart_pads);\n" "\n" "Also, maybe make that into a separate function with comments added that\n" "we check that the default pins are muxed to uart rx and tx mode to start\n" @@ -68,10 +62,6 @@ "\n" "Regards,\n" "\n" - "Tony\n" - "--\n" - "To unsubscribe from this list: send the line \"unsubscribe linux-omap\" in\n" - "the body of a message to majordomo@vger.kernel.org\n" - More majordomo info at http://vger.kernel.org/majordomo-info.html + Tony -53136e411590290d660f9dfbc2b17de3d52ed25be06582ca0f7b2c2adf6ab7c1 +531c02dc99d39eb89a52936e3dd34d3064850522ba2b0776259172e1e1c11193
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.