arm: msm: remove board file for Nexus One (ie. mahimahi)

PATCH In review Paul Bolle 4 participants 8 messages May 14, 2014 – May 29, 2014

Subsystems (3)

Arm (32-bit) Arm sub-architectures Arm Qualcomm mailing list

lore

Share & tools

lore

Paul Bolle

author

2014-05-14 21:07 UTC #0 lore raw

PATCH 1/1 arm: msm: remove board file for Nexus One (ie. mahimahi)

Commit 1b802ff79f03 ("arm: msm: add board file for Nexus One (ie. mahimahi)") added just board-mahimahi.c. It did not add board-mahimahi.h, Makefile changes or Kconfig changes.

Four years have passed and this file is still dangling. Remove it.

Signed-off-by Paul Bolle <[email protected]>

---
Untested. But what to test here?

 arch/arm/mach-msm/board-mahimahi.c | 88 --------------------------------------
 1 file changed, 88 deletions(-)
 delete mode 100644 arch/arm/mach-msm/board-mahimahi.c

arch/arm/mach-msm/board-mahimahi.c deleted +0 ~~-88~~

deleted file mode 100644
index 7d9981cb400e..000000000000
@@ -1,88 +0,0 @@
-/* linux/arch/arm/mach-msm/board-mahimahi.c
- *
- * Copyright (C) 2009 Google, Inc.
- * Copyright (C) 2009 HTC Corporation.
- * Author: Dima Zavin <[email protected]>
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
-
-#include <linux/delay.h>
-#include <linux/gpio.h>
-#include <linux/init.h>
-#include <linux/input.h>
-#include <linux/io.h>
-#include <linux/kernel.h>
-#include <linux/platform_device.h>
-
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
-#include <asm/mach/map.h>
-#include <asm/setup.h>
-
-#include <mach/hardware.h>
-
-#include "board-mahimahi.h"
-#include "devices.h"
-#include "proc_comm.h"
-#include "common.h"
-
-static uint debug_uart;
-
-module_param_named(debug_uart, debug_uart, uint, 0);
-
-static struct platform_device *devices[] __initdata = {
-#if !defined(CONFIG_MSM_SERIAL_DEBUGGER)
-	&msm_device_uart1,
-#endif
-	&msm_device_uart_dm1,
-	&msm_device_nand,
-};
-
-static void __init mahimahi_init(void)
-{
-	platform_add_devices(devices, ARRAY_SIZE(devices));
-}
-
-static void __init mahimahi_fixup(struct tag *tags, char **cmdline,
-				  struct meminfo *mi)
-{
-	mi->nr_banks = 2;
-	mi->bank[0].start = PHYS_OFFSET;
-	mi->bank[0].node = PHYS_TO_NID(PHYS_OFFSET);
-	mi->bank[0].size = (219*1024*1024);
-	mi->bank[1].start = MSM_HIGHMEM_BASE;
-	mi->bank[1].node = PHYS_TO_NID(MSM_HIGHMEM_BASE);
-	mi->bank[1].size = MSM_HIGHMEM_SIZE;
-}
-
-static void __init mahimahi_map_io(void)
-{
-	msm_map_common_io();
-	msm_clock_init();
-}
-
-static void __init mahimahi_init_late(void)
-{
-	smd_debugfs_init();
-}
-
-void msm_timer_init(void);
-
-MACHINE_START(MAHIMAHI, "mahimahi")
-	.atag_offset	= 0x100,
-	.fixup		= mahimahi_fixup,
-	.map_io		= mahimahi_map_io,
-	.init_irq	= msm_init_irq,
-	.init_machine	= mahimahi_init,
-	.init_late	= mahimahi_init_late,
-	.init_time	= msm_timer_init,
-MACHINE_END

Signature · 1 line

1.9.0

[email protected]

2014-05-15 17:44 UTC #1 lore raw

Quoted 10 lines · Paul Bolle

Commit 1b802ff79f03 ("arm: msm: add board file for Nexus One (ie. mahimahi)") added just board-mahimahi.c. It did not add board-mahimahi.h, Makefile changes or Kconfig changes.
Four years have passed and this file is still dangling. Remove it.
Signed-off-by Paul Bolle <[email protected]>
---
Untested. But what to test here?

I don't mine if Sapphire gets removed, but I'm working on this one now.. So I don't want it deleted.

Daniel

Paul Bolle

author

2014-05-15 18:10 UTC #2 lore raw

Daniel,

Quoted 5 lines · On Thu, 2014-05-15 at 17:44 +0000, dwalker at fifo99.com wrote:

Quoted 4 lines · Paul Bolle
Commit 1b802ff79f03 ("arm: msm: add board file for Nexus One (ie. mahimahi)") added just board-mahimahi.c. It did not add board-mahimahi.h, Makefile changes or Kconfig changes.

Quoted 7 lines

Quoted 6 lines
Four years have passed and this file is still dangling. Remove it.
Signed-off-by Paul Bolle <[email protected]>
---
Untested. But what to test here?
I don't mine if Sapphire gets removed,

Could you ACK that patch, please?

Quoted 1 line

but I'm working on this one now..

That's good to hear.

Quoted 1 line

So I don't want it deleted.

This is not something I get to decide. Nevertheless, given that this file shouldn't have been merged to begin with, I'd appreciate it if some deadline could be agreed upon.

That being said, I'm not sure how having just this file in mainline helps your development efforts. It seems it did receive some updates for, well, treewide stuff. But it surely didn't get build coverage or runtime testing. So would you lose much if it only remains in your development tree?

Paul Bolle

[email protected]

2014-05-15 21:57 UTC #3 lore raw

Quoted 10 lines · Paul Bolle

Daniel,
Quoted 7 lines · On Thu, 2014-05-15 at 17:44 +0000, dwalker at fifo99.com wrote:
Quoted 6 lines · Paul Bolle
Commit 1b802ff79f03 ("arm: msm: add board file for Nexus One (ie. mahimahi)") added just board-mahimahi.c. It did not add board-mahimahi.h, Makefile changes or Kconfig changes.
Four years have passed and this file is still dangling. Remove it.

Quoted 7 lines

Quoted 5 lines
Quoted 4 lines
Signed-off-by Paul Bolle <[email protected]>
---
Untested. But what to test here?
I don't mine if Sapphire gets removed,
Could you ACK that patch, please?

I don't mind if it gets removed, but I wouldn't ACK it's removal ..

Quoted 9 lines

Quoted 1 line
but I'm working on this one now..
That's good to hear.
Quoted 1 line
So I don't want it deleted.
This is not something I get to decide. Nevertheless, given that this file shouldn't have been merged to begin with, I'd appreciate it if some deadline could be agreed upon.

I think I merged it actually, but there's no rules about what gets merged. How when what order, etc. It's all free form.

Quoted 5 lines

That being said, I'm not sure how having just this file in mainline helps your development efforts. It seems it did receive some updates for, well, treewide stuff. But it surely didn't get build coverage or runtime testing. So would you lose much if it only remains in your development tree?

It's effort to remove it.. Your asking for it to get removed, then re-added.. That sounds like a fairly large amount of effort vs just leaving it in place.

Daniel

Paul Bolle

author

2014-05-19 11:53 UTC #4 lore raw

Daniel,

Quoted 7 lines · On Thu, 2014-05-15 at 21:57 +0000, dwalker at fifo99.com wrote:

Quoted 3 lines · Paul Bolle
This is not something I get to decide. Nevertheless, given that this file shouldn't have been merged to begin with, I'd appreciate it if some deadline could be agreed upon.
I think I merged it actually, but there's no rules about what gets merged. How when what order, etc. It's all free form.

There do not seem to be formal rules. But there surely are some requirements for code to be added. One of the requirements is, I think, that it should build. This file cannot be built: it is not wired into a Makefile and it also includes, what appears to be, its own header file, but that header is not part of the tree.

Even the most dubious of code in drivers/staging is expected to "compile properly"!

Quoted 8 lines

Quoted 5 lines
That being said, I'm not sure how having just this file in mainline helps your development efforts. It seems it did receive some updates for, well, treewide stuff. But it surely didn't get build coverage or runtime testing. So would you lose much if it only remains in your development tree?
It's effort to remove it.. Your asking for it to get removed, then re-added.. That sounds like a fairly large amount of effort vs just leaving it in place.

Yes, it takes some effort to remove code. And it will also take effort to re-add that code later. But I think that's a risk one runs with code that has clearly never been buildable.

Paul Bolle

[email protected]

2014-05-19 14:30 UTC #5 lore raw

Quoted 8 lines · Paul Bolle

Daniel,
Quoted 5 lines · On Thu, 2014-05-15 at 21:57 +0000, dwalker at fifo99.com wrote:
Quoted 3 lines · Paul Bolle
This is not something I get to decide. Nevertheless, given that this file shouldn't have been merged to begin with, I'd appreciate it if some deadline could be agreed upon.

Quoted 8 lines

Quoted 2 lines
I think I merged it actually, but there's no rules about what gets merged. How when what order, etc. It's all free form.
There do not seem to be formal rules. But there surely are some requirements for code to be added. One of the requirements is, I think, that it should build. This file cannot be built: it is not wired into a Makefile and it also includes, what appears to be, its own header file, but that header is not part of the tree.

The requirements are created by the maintainers.. In this case I would have expected support for this phone much sooner, and there are in fact patches on the list to support it which just haven't been merged yet.

Quoted 2 lines

Even the most dubious of code in drivers/staging is expected to "compile properly"!

But mach-msm isn't staging, different rules apply there.

Daniel

Ivan T. Ivanov

2014-05-20 06:43 UTC #6 lore raw

Quoted 1 line · On Mon, 2014-05-19 at 14:30 +0000, dwalker at fifo99.com wrote:

On Mon, May 19, 2014 at 01:53:28PM +0200, Paul Bolle wrote:

<snip>

Quoted 5 lines

Quoted 3 lines
Even the most dubious of code in drivers/staging is expected to "compile properly"!
But mach-msm isn't staging, different rules apply there.

Heh, different rules you say: "Please send me a patches which even didn't compile". This is most relaxed reading of Documentation/SubmittingPatches that I have heard :-)

Ivan

Quoted 2 lines

Daniel

Pavel Machek

2014-05-29 18:29 UTC #7 lore raw

In reply to Paul Bolle

Quoted 20 lines · Paul Bolle

Daniel,
Quoted 5 lines · On Thu, 2014-05-15 at 17:44 +0000, dwalker at fifo99.com wrote:
Quoted 4 lines · Paul Bolle
Commit 1b802ff79f03 ("arm: msm: add board file for Nexus One (ie. mahimahi)") added just board-mahimahi.c. It did not add board-mahimahi.h, Makefile changes or Kconfig changes.
Quoted 7 lines
Quoted 6 lines
Four years have passed and this file is still dangling. Remove it.
Signed-off-by Paul Bolle <[email protected]>
---
Untested. But what to test here?
I don't mine if Sapphire gets removed,
Could you ACK that patch, please?
Quoted 1 line
but I'm working on this one now..

Quoted 7 lines

That's good to hear.
Quoted 1 line
So I don't want it deleted.
This is not something I get to decide. Nevertheless, given that this file shouldn't have been merged to begin with, I'd appreciate it if some deadline could be agreed upon.

Daniel is working on solving that. That should be enough. It is not as the file is great problem to anybody.

If it is not fixed within year, you may want to retransmit your patch.

Pavel

Signature · 2 lines

(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html