Skip to content

Commit

Permalink
[POWERPC] 8xx: Remove unused m8xx_cpm_hostalloc/free/dump()
Browse files Browse the repository at this point in the history
m8xx_cpm_hostalloc is still defined in commproc.c, but no users are left
in the kernel tree. m8xx_cpm_hostfree and m8xx_cpm_hostdump are only
defined in the headers. Remove this dead code.

Signed-off-by: Jochen Friedrich <jochen@scram.de>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
  • Loading branch information
Jochen Friedrich authored and Kumar Gala committed Jan 28, 2008
1 parent 7607341 commit 22f19da
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 83 deletions.
37 changes: 0 additions & 37 deletions arch/powerpc/sysdev/commproc.c
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@
#ifndef CONFIG_PPC_CPM_NEW_BINDING
static void m8xx_cpm_dpinit(void);
#endif
static uint host_buffer; /* One page of host buffer */
static uint host_end; /* end + 1 */
cpm8xx_t __iomem *cpmp; /* Pointer to comm processor space */
immap_t __iomem *mpc8xx_immr;
static cpic8xx_t __iomem *cpic_reg;
Expand Down Expand Up @@ -268,41 +266,6 @@ int cpm_command(u32 command, u8 opcode)
}
EXPORT_SYMBOL(cpm_command);

/* We used to do this earlier, but have to postpone as long as possible
* to ensure the kernel VM is now running.
*/
static void
alloc_host_memory(void)
{
dma_addr_t physaddr;

/* Set the host page for allocation.
*/
host_buffer = (uint)dma_alloc_coherent(NULL, PAGE_SIZE, &physaddr,
GFP_KERNEL);
host_end = host_buffer + PAGE_SIZE;
}

/* We also own one page of host buffer space for the allocation of
* UART "fifos" and the like.
*/
uint
m8xx_cpm_hostalloc(uint size)
{
uint retloc;

if (host_buffer == 0)
alloc_host_memory();

if ((host_buffer + size) >= host_end)
return(0);

retloc = host_buffer;
host_buffer += size;

return(retloc);
}

/* Set a baud rate generator. This needs lots of work. There are
* four BRGs, any of which can be wired to any channel.
* The internal baud rate clock is the system clock divided by 16.
Expand Down
38 changes: 0 additions & 38 deletions arch/ppc/8xx_io/commproc.c
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,6 @@
})

static void m8xx_cpm_dpinit(void);
static uint host_buffer; /* One page of host buffer */
static uint host_end; /* end + 1 */
cpm8xx_t *cpmp; /* Pointer to comm processor space */

/* CPM interrupt vector functions.
Expand All @@ -68,7 +66,6 @@ struct cpm_action {
static struct cpm_action cpm_vecs[CPMVEC_NR];
static irqreturn_t cpm_interrupt(int irq, void * dev);
static irqreturn_t cpm_error_interrupt(int irq, void *dev);
static void alloc_host_memory(void);
/* Define a table of names to identify CPM interrupt handlers in
* /proc/interrupts.
*/
Expand Down Expand Up @@ -158,21 +155,6 @@ m8xx_cpm_reset(void)
cpmp = (cpm8xx_t *)commproc;
}

/* We used to do this earlier, but have to postpone as long as possible
* to ensure the kernel VM is now running.
*/
static void
alloc_host_memory(void)
{
dma_addr_t physaddr;

/* Set the host page for allocation.
*/
host_buffer = (uint)dma_alloc_coherent(NULL, PAGE_SIZE, &physaddr,
GFP_KERNEL);
host_end = host_buffer + PAGE_SIZE;
}

/* This is called during init_IRQ. We used to do it above, but this
* was too early since init_IRQ was not yet called.
*/
Expand Down Expand Up @@ -319,26 +301,6 @@ cpm_free_handler(int cpm_vec)
cpm_vecs[cpm_vec].dev_id = NULL;
}

/* We also own one page of host buffer space for the allocation of
* UART "fifos" and the like.
*/
uint
m8xx_cpm_hostalloc(uint size)
{
uint retloc;

if (host_buffer == 0)
alloc_host_memory();

if ((host_buffer + size) >= host_end)
return(0);

retloc = host_buffer;
host_buffer += size;

return(retloc);
}

/* Set a baud rate generator. This needs lots of work. There are
* four BRGs, any of which can be wired to any channel.
* The internal baud rate clock is the system clock divided by 16.
Expand Down
4 changes: 0 additions & 4 deletions include/asm-powerpc/commproc.h
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,6 @@ extern uint cpm_dpram_phys(u8* addr);

extern void cpm_setbrg(uint brg, uint rate);

extern uint m8xx_cpm_hostalloc(uint size);
extern int m8xx_cpm_hostfree(uint start);
extern void m8xx_cpm_hostdump(void);

extern void cpm_load_patch(cpm8xx_t *cp);

/* Buffer descriptors used by many of the CPM protocols.
Expand Down
4 changes: 0 additions & 4 deletions include/asm-ppc/commproc.h
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,6 @@ extern void *cpm_dpram_addr(unsigned long offset);
extern uint cpm_dpram_phys(u8* addr);
extern void cpm_setbrg(uint brg, uint rate);

extern uint m8xx_cpm_hostalloc(uint size);
extern int m8xx_cpm_hostfree(uint start);
extern void m8xx_cpm_hostdump(void);

extern void cpm_load_patch(volatile immap_t *immr);

/* Buffer descriptors used by many of the CPM protocols.
Expand Down

0 comments on commit 22f19da

Please sign in to comment.