* small libata cleanup
@ 2016-09-22 14:49 Christoph Hellwig
2016-09-22 14:49 ` [PATCH 1/2] libata: remove unused definitions from <asm/libata-portmap.h> Christoph Hellwig
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Christoph Hellwig @ 2016-09-22 14:49 UTC (permalink / raw)
To: tj; +Cc: linux-ide
Hi Tejun,
this series cleans up the few architecture libata-portmap.h headers we
have, and removes the odd asm-generic/libata-portmap.h one.
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH 1/2] libata: remove unused definitions from <asm/libata-portmap.h>
2016-09-22 14:49 small libata cleanup Christoph Hellwig
@ 2016-09-22 14:49 ` Christoph Hellwig
2016-09-22 14:49 ` [PATCH 2/2] libata: remove <asm-generic/libata-portmap.h> Christoph Hellwig
2016-09-22 15:51 ` small libata cleanup Tejun Heo
2 siblings, 0 replies; 4+ messages in thread
From: Christoph Hellwig @ 2016-09-22 14:49 UTC (permalink / raw)
To: tj; +Cc: linux-ide
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
arch/ia64/include/asm/libata-portmap.h | 4 ----
arch/powerpc/include/asm/libata-portmap.h | 4 ----
2 files changed, 8 deletions(-)
diff --git a/arch/ia64/include/asm/libata-portmap.h b/arch/ia64/include/asm/libata-portmap.h
index 0e00c9a..7a1f831 100644
--- a/arch/ia64/include/asm/libata-portmap.h
+++ b/arch/ia64/include/asm/libata-portmap.h
@@ -1,12 +1,8 @@
#ifndef __ASM_IA64_LIBATA_PORTMAP_H
#define __ASM_IA64_LIBATA_PORTMAP_H
-#define ATA_PRIMARY_CMD 0x1F0
-#define ATA_PRIMARY_CTL 0x3F6
#define ATA_PRIMARY_IRQ(dev) isa_irq_to_vector(14)
-#define ATA_SECONDARY_CMD 0x170
-#define ATA_SECONDARY_CTL 0x376
#define ATA_SECONDARY_IRQ(dev) isa_irq_to_vector(15)
#endif
diff --git a/arch/powerpc/include/asm/libata-portmap.h b/arch/powerpc/include/asm/libata-portmap.h
index 4d85180..4396db5 100644
--- a/arch/powerpc/include/asm/libata-portmap.h
+++ b/arch/powerpc/include/asm/libata-portmap.h
@@ -1,12 +1,8 @@
#ifndef __ASM_POWERPC_LIBATA_PORTMAP_H
#define __ASM_POWERPC_LIBATA_PORTMAP_H
-#define ATA_PRIMARY_CMD 0x1F0
-#define ATA_PRIMARY_CTL 0x3F6
#define ATA_PRIMARY_IRQ(dev) pci_get_legacy_ide_irq(dev, 0)
-#define ATA_SECONDARY_CMD 0x170
-#define ATA_SECONDARY_CTL 0x376
#define ATA_SECONDARY_IRQ(dev) pci_get_legacy_ide_irq(dev, 1)
#endif
--
2.1.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] libata: remove <asm-generic/libata-portmap.h>
2016-09-22 14:49 small libata cleanup Christoph Hellwig
2016-09-22 14:49 ` [PATCH 1/2] libata: remove unused definitions from <asm/libata-portmap.h> Christoph Hellwig
@ 2016-09-22 14:49 ` Christoph Hellwig
2016-09-22 15:51 ` small libata cleanup Tejun Heo
2 siblings, 0 replies; 4+ messages in thread
From: Christoph Hellwig @ 2016-09-22 14:49 UTC (permalink / raw)
To: tj; +Cc: linux-ide
asm-generic is only intended for architecture defaults, and we can simply
kill it off by moving the two defintions directly to <linux/libata.h>.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
include/asm-generic/libata-portmap.h | 7 -------
include/linux/libata.h | 3 ++-
2 files changed, 2 insertions(+), 8 deletions(-)
delete mode 100644 include/asm-generic/libata-portmap.h
diff --git a/include/asm-generic/libata-portmap.h b/include/asm-generic/libata-portmap.h
deleted file mode 100644
index cf14f2f..0000000
--- a/include/asm-generic/libata-portmap.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef __ASM_GENERIC_LIBATA_PORTMAP_H
-#define __ASM_GENERIC_LIBATA_PORTMAP_H
-
-#define ATA_PRIMARY_IRQ(dev) 14
-#define ATA_SECONDARY_IRQ(dev) 15
-
-#endif
diff --git a/include/linux/libata.h b/include/linux/libata.h
index e37d4f9..616eef4 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -46,7 +46,8 @@
#ifdef CONFIG_ATA_NONSTANDARD
#include <asm/libata-portmap.h>
#else
-#include <asm-generic/libata-portmap.h>
+#define ATA_PRIMARY_IRQ(dev) 14
+#define ATA_SECONDARY_IRQ(dev) 15
#endif
/*
--
2.1.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: small libata cleanup
2016-09-22 14:49 small libata cleanup Christoph Hellwig
2016-09-22 14:49 ` [PATCH 1/2] libata: remove unused definitions from <asm/libata-portmap.h> Christoph Hellwig
2016-09-22 14:49 ` [PATCH 2/2] libata: remove <asm-generic/libata-portmap.h> Christoph Hellwig
@ 2016-09-22 15:51 ` Tejun Heo
2 siblings, 0 replies; 4+ messages in thread
From: Tejun Heo @ 2016-09-22 15:51 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: linux-ide
On Thu, Sep 22, 2016 at 07:49:48AM -0700, Christoph Hellwig wrote:
> Hi Tejun,
>
> this series cleans up the few architecture libata-portmap.h headers we
> have, and removes the odd asm-generic/libata-portmap.h one.
Applied 1-2 to libata/for-4.9.
Thanks.
--
tejun
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-09-22 15:51 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-22 14:49 small libata cleanup Christoph Hellwig
2016-09-22 14:49 ` [PATCH 1/2] libata: remove unused definitions from <asm/libata-portmap.h> Christoph Hellwig
2016-09-22 14:49 ` [PATCH 2/2] libata: remove <asm-generic/libata-portmap.h> Christoph Hellwig
2016-09-22 15:51 ` small libata cleanup Tejun Heo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).