mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-11 12:28:41 +08:00
Merge branch 'testing/driver-warnings' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into fixes
A collection of warning fixes on non-ARM code from Arnd Bergmann: * 'testing/driver-warnings' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: ARM: s3c: mark s3c2440_clk_add as __init_refok spi/s3c64xx: use correct dma_transfer_direction type pcmcia: sharpsl: don't discard sharpsl_pcmcia_ops USB: EHCI: mark ehci_orion_conf_mbus_windows __devinit mm/slob: use min_t() to compare ARCH_SLAB_MINALIGN SCSI: ARM: make fas216_dumpinfo function conditional SCSI: ARM: ncr5380/oak uses no interrupts
This commit is contained in:
commit
068a565afa
@ -163,7 +163,7 @@ static struct clk_lookup s3c2440_clk_lookup[] = {
|
||||
CLKDEV_INIT(NULL, "clk_uart_baud3", &s3c2440_clk_fclk_n),
|
||||
};
|
||||
|
||||
static int s3c2440_clk_add(struct device *dev, struct subsys_interface *sif)
|
||||
static int __init_refok s3c2440_clk_add(struct device *dev, struct subsys_interface *sif)
|
||||
{
|
||||
struct clk *clock_upll;
|
||||
struct clk *clock_h;
|
||||
|
@ -194,7 +194,7 @@ static void sharpsl_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
|
||||
sharpsl_pcmcia_init_reset(skt);
|
||||
}
|
||||
|
||||
static struct pcmcia_low_level sharpsl_pcmcia_ops __initdata = {
|
||||
static struct pcmcia_low_level sharpsl_pcmcia_ops = {
|
||||
.owner = THIS_MODULE,
|
||||
.hw_init = sharpsl_pcmcia_hw_init,
|
||||
.socket_state = sharpsl_pcmcia_socket_state,
|
||||
|
@ -179,6 +179,7 @@ static void print_SCp(struct scsi_pointer *SCp, const char *prefix, const char *
|
||||
SCp->buffers_residual, suffix);
|
||||
}
|
||||
|
||||
#ifdef CHECK_STRUCTURE
|
||||
static void fas216_dumpinfo(FAS216_Info *info)
|
||||
{
|
||||
static int used = 0;
|
||||
@ -223,7 +224,6 @@ static void fas216_dumpinfo(FAS216_Info *info)
|
||||
info->internal_done, info->magic_end);
|
||||
}
|
||||
|
||||
#ifdef CHECK_STRUCTURE
|
||||
static void __fas216_checkmagic(FAS216_Info *info, const char *func)
|
||||
{
|
||||
int corruption = 0;
|
||||
|
@ -21,6 +21,7 @@
|
||||
/*#define PSEUDO_DMA*/
|
||||
|
||||
#define OAKSCSI_PUBLIC_RELEASE 1
|
||||
#define DONT_USE_INTR
|
||||
|
||||
#define priv(host) ((struct NCR5380_hostdata *)(host)->hostdata)
|
||||
#define NCR5380_local_declare() void __iomem *_base
|
||||
|
@ -132,7 +132,7 @@
|
||||
|
||||
struct s3c64xx_spi_dma_data {
|
||||
unsigned ch;
|
||||
enum dma_data_direction direction;
|
||||
enum dma_transfer_direction direction;
|
||||
enum dma_ch dmach;
|
||||
struct property *dma_prop;
|
||||
};
|
||||
@ -1067,11 +1067,11 @@ static int __devinit s3c64xx_spi_get_dmares(
|
||||
|
||||
if (tx) {
|
||||
dma_data = &sdd->tx_dma;
|
||||
dma_data->direction = DMA_TO_DEVICE;
|
||||
dma_data->direction = DMA_MEM_TO_DEV;
|
||||
chan_str = "tx";
|
||||
} else {
|
||||
dma_data = &sdd->rx_dma;
|
||||
dma_data->direction = DMA_FROM_DEVICE;
|
||||
dma_data->direction = DMA_DEV_TO_MEM;
|
||||
chan_str = "rx";
|
||||
}
|
||||
|
||||
|
@ -160,7 +160,7 @@ static const struct hc_driver ehci_orion_hc_driver = {
|
||||
.clear_tt_buffer_complete = ehci_clear_tt_buffer_complete,
|
||||
};
|
||||
|
||||
static void __init
|
||||
static void __devinit
|
||||
ehci_orion_conf_mbus_windows(struct usb_hcd *hcd,
|
||||
const struct mbus_dram_target_info *dram)
|
||||
{
|
||||
|
@ -429,7 +429,7 @@ static __always_inline void *
|
||||
__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
|
||||
{
|
||||
unsigned int *m;
|
||||
int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
|
||||
int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
|
||||
void *ret;
|
||||
|
||||
gfp &= gfp_allowed_mask;
|
||||
@ -502,7 +502,7 @@ void kfree(const void *block)
|
||||
|
||||
sp = virt_to_page(block);
|
||||
if (PageSlab(sp)) {
|
||||
int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
|
||||
int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
|
||||
unsigned int *m = (unsigned int *)(block - align);
|
||||
slob_free(m, *m + align);
|
||||
} else
|
||||
@ -521,7 +521,7 @@ size_t ksize(const void *block)
|
||||
|
||||
sp = virt_to_page(block);
|
||||
if (PageSlab(sp)) {
|
||||
int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
|
||||
int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
|
||||
unsigned int *m = (unsigned int *)(block - align);
|
||||
return SLOB_UNITS(*m) * SLOB_UNIT;
|
||||
} else
|
||||
|
Loading…
Reference in New Issue
Block a user