Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 9bd7ea60b1a0cf9fc745fd2eadb261e4c7719acd

Authored by Stephen Rothwell
Committed by Paul Mackerras
1 parent ee2cdecec4
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[PATCH] powerpc: clean up iommu.h a bit 

There was a function declared for CONFIG_PSERIES which no longer exists
and the two function declarations for CONFIG_ISERIES have been moved
into an include file in platforms/iseries since they are defined and
used only there.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>

Showing 5 changed files with 40 additions and 19 deletions Side-by-side Diff

arch/powerpc/platforms/iseries/iommu.c
Diff comments   View file @ 9bd7ea6
... ... @@ -34,6 +34,8 @@
34 34 #include <asm/pci-bridge.h>
35 35 #include <asm/iseries/hv_call_xm.h>
36 36  
  37 +#include "iommu.h"
  38 +
37 39 extern struct list_head iSeries_Global_Device_List;
38 40  
39 41  
arch/powerpc/platforms/iseries/iommu.h
Diff comments   View file @ 9bd7ea6
  1 +#ifndef _PLATFORMS_ISERIES_IOMMU_H
  2 +#define _PLATFORMS_ISERIES_IOMMU_H
  3 +
  4 +/*
  5 + * Copyright (C) 2005 Stephen Rothwell, IBM Corporation
  6 + *
  7 + * This program is free software; you can redistribute it and/or modify
  8 + * it under the terms of the GNU General Public License as published by
  9 + * the Free Software Foundation; either version 2 of the License, or
  10 + * (at your option) any later version.
  11 + *
  12 + * This program is distributed in the hope that it will be useful,
  13 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
  14 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  15 + * GNU General Public License for more details.
  16 + *
  17 + * You should have received a copy of the GNU General Public License
  18 + * along with this program; if not, write to the:
  19 + * Free Software Foundation, Inc.,
  20 + * 59 Temple Place, Suite 330,
  21 + * Boston, MA 02111-1307 USA
  22 + */
  23 +
  24 +struct device_node;
  25 +struct iommu_table;
  26 +
  27 +/* Creates table for an individual device node */
  28 +extern void iommu_devnode_init_iSeries(struct device_node *dn);
  29 +
  30 +/* Get table parameters from HV */
  31 +extern void iommu_table_getparms_iSeries(unsigned long busno,
  32 + unsigned char slotno, unsigned char virtbus,
  33 + struct iommu_table *tbl);
  34 +
  35 +#endif /* _PLATFORMS_ISERIES_IOMMU_H */
arch/powerpc/platforms/iseries/pci.c
Diff comments   View file @ 9bd7ea6
... ... @@ -43,6 +43,7 @@
43 43 #include "irq.h"
44 44 #include "pci.h"
45 45 #include "call_pci.h"
  46 +#include "iommu.h"
46 47  
47 48 extern unsigned long io_page_mask;
48 49  
arch/powerpc/platforms/iseries/vio.c
Diff comments   View file @ 9bd7ea6
... ... @@ -22,6 +22,8 @@
22 22 #include <asm/iseries/hv_lp_config.h>
23 23 #include <asm/iseries/hv_call_xm.h>
24 24  
  25 +#include "iommu.h"
  26 +
25 27 struct device *iSeries_vio_dev = &vio_bus_device.dev;
26 28 EXPORT_SYMBOL(iSeries_vio_dev);
27 29  
include/asm-powerpc/iommu.h
Diff comments   View file @ 9bd7ea6
... ... @@ -64,25 +64,6 @@
64 64  
65 65 #endif /* CONFIG_PPC_MULTIPLATFORM */
66 66  
67   -#ifdef CONFIG_PPC_PSERIES
68   -
69   -/* Creates table for an individual device node */
70   -extern void iommu_devnode_init_pSeries(struct device_node *dn);
71   -
72   -#endif /* CONFIG_PPC_PSERIES */
73   -
74   -#ifdef CONFIG_PPC_ISERIES
75   -
76   -/* Creates table for an individual device node */
77   -extern void iommu_devnode_init_iSeries(struct device_node *dn);
78   -/* Get table parameters from HV */
79   -extern void iommu_table_getparms_iSeries(unsigned long busno,
80   - unsigned char slotno,
81   - unsigned char virtbus,
82   - struct iommu_table* tbl);
83   -
84   -#endif /* CONFIG_PPC_ISERIES */
85   -
86 67 /* Initializes an iommu_table based in values set in the passed-in
87 68 * structure
88 69 */