diff for duplicates of <8762e6et1u.fsf@ti.com> diff --git a/a/1.txt b/N1/1.txt index 8f7a4c5..7af1e5f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -18,24 +18,24 @@ >> warnings. >> >>> --- ->>> arch/arm/mach-omap2/opp.c | 4 ++++ ->>> 1 files changed, 4 insertions(+), 0 deletions(-) +>>> ?arch/arm/mach-omap2/opp.c | ? ?4 ++++ +>>> ?1 files changed, 4 insertions(+), 0 deletions(-) >>> >>> diff --git a/arch/arm/mach-omap2/opp.c b/arch/arm/mach-omap2/opp.c >>> index 9262a6b..414f2ec 100644 >>> --- a/arch/arm/mach-omap2/opp.c >>> +++ b/arch/arm/mach-omap2/opp.c >>> @@ -62,6 +62,10 @@ int __init omap_init_opp_table(struct omap_opp_def *opp_def, ->>> __func__, i); ->>> return -EINVAL; ->>> } +>>> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? __func__, i); +>>> ? ? ? ? ? ? ? ? ? ? ? return -EINVAL; +>>> ? ? ? ? ? ? ? } >>> + ->>> + if ((strcmp(opp_def->hwmod_name,"iva") == 0) && !omap3_has_iva()) ->>> + continue; +>>> + ? ? ? ? ? ? if ((strcmp(opp_def->hwmod_name,"iva") == 0) && !omap3_has_iva()) +>>> + ? ? ? ? ? ? ? ? ? ? continue; >>> + ->>> oh = omap_hwmod_lookup(opp_def->hwmod_name); ->>> if (!oh || !oh->od) { ->>> pr_warn("%s: no hwmod or odev for %s, [%d] " +>>> ? ? ? ? ? ? ? oh = omap_hwmod_lookup(opp_def->hwmod_name); +>>> ? ? ? ? ? ? ? if (!oh || !oh->od) { +>>> ? ? ? ? ? ? ? ? ? ? ? pr_warn("%s: no hwmod or odev for %s, [%d] " >> >> Wouldn't the one-liner below do the same thing? >> @@ -52,7 +52,3 @@ I agree, that would be a better generic solution. Kevin --- -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 8587fde..ce0489b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,15 +1,10 @@ "ref\01331746695-24372-1-git-send-email-mvs@tigris.de\0" "ref\0874ntqg9yr.fsf@ti.com\0" "ref\0CAOMWX4eYQvwHfpci1AgLO8kk1yxzB-zruMQQvLXeLnxbfUHFgw@mail.gmail.com\0" - "From\0Kevin Hilman <khilman@ti.com>\0" - "Subject\0Re: [PATCH] OMAP3: OPP: Test for IVA subsystem before attempting to add IVA OPP\0" + "From\0khilman@ti.com (Kevin Hilman)\0" + "Subject\0[PATCH] OMAP3: OPP: Test for IVA subsystem before attempting to add IVA OPP\0" "Date\0Wed, 14 Mar 2012 15:06:37 -0700\0" - "To\0Menon" - " Nishanth <nm@ti.com>\0" - "Cc\0Maximilian Schwerin <mvs@tigris.de>" - linux-omap@vger.kernel.org - linux-arm-kernel@lists.infradead.org - " Steve Sakoman <steve@sakoman.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "\"Menon, Nishanth\" <nm@ti.com> writes:\n" @@ -32,24 +27,24 @@ ">> warnings.\n" ">>\n" ">>> ---\n" - ">>> \302\240arch/arm/mach-omap2/opp.c | \302\240 \302\2404 ++++\n" - ">>> \302\2401 files changed, 4 insertions(+), 0 deletions(-)\n" + ">>> ?arch/arm/mach-omap2/opp.c | ? ?4 ++++\n" + ">>> ?1 files changed, 4 insertions(+), 0 deletions(-)\n" ">>>\n" ">>> diff --git a/arch/arm/mach-omap2/opp.c b/arch/arm/mach-omap2/opp.c\n" ">>> index 9262a6b..414f2ec 100644\n" ">>> --- a/arch/arm/mach-omap2/opp.c\n" ">>> +++ b/arch/arm/mach-omap2/opp.c\n" ">>> @@ -62,6 +62,10 @@ int __init omap_init_opp_table(struct omap_opp_def *opp_def,\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 __func__, i);\n" - ">>> \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 return -EINVAL;\n" - ">>> \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 }\n" + ">>> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? __func__, i);\n" + ">>> ? ? ? ? ? ? ? ? ? ? ? return -EINVAL;\n" + ">>> ? ? ? ? ? ? ? }\n" ">>> +\n" - ">>> + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 if ((strcmp(opp_def->hwmod_name,\"iva\") == 0) && !omap3_has_iva())\n" - ">>> + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 continue;\n" + ">>> + ? ? ? ? ? ? if ((strcmp(opp_def->hwmod_name,\"iva\") == 0) && !omap3_has_iva())\n" + ">>> + ? ? ? ? ? ? ? ? ? ? continue;\n" ">>> +\n" - ">>> \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 oh = omap_hwmod_lookup(opp_def->hwmod_name);\n" - ">>> \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 if (!oh || !oh->od) {\n" - ">>> \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 pr_warn(\"%s: no hwmod or odev for %s, [%d] \"\n" + ">>> ? ? ? ? ? ? ? oh = omap_hwmod_lookup(opp_def->hwmod_name);\n" + ">>> ? ? ? ? ? ? ? if (!oh || !oh->od) {\n" + ">>> ? ? ? ? ? ? ? ? ? ? ? pr_warn(\"%s: no hwmod or odev for %s, [%d] \"\n" ">>\n" ">> Wouldn't the one-liner below do the same thing?\n" ">>\n" @@ -65,10 +60,6 @@ "\n" "I agree, that would be a better generic solution.\n" "\n" - "Kevin\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 + Kevin -5a92affa9c3a2f286d76365b1455b17e5632050676f972f4fe7b21c0f0a18a85 +6e368e1078b84ccf32cb135a0f06a49fd36cd1fd15914a15a0635c02bbf6ce6f
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.