Skip to content

Commit 068a565

Browse files
olofjolofj
committed
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
2 parents b55a7a5 + 5276b68 commit 068a565

File tree

7 files changed

+11
-10
lines changed

7 files changed

+11
-10
lines changed

‎arch/arm/mach-s3c24xx/clock-s3c2440.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ static struct clk_lookup s3c2440_clk_lookup[] = {
163163
CLKDEV_INIT(NULL, "clk_uart_baud3", &s3c2440_clk_fclk_n),
164164
};
165165

166-
static int s3c2440_clk_add(struct device *dev, struct subsys_interface *sif)
166+
static int __init_refok s3c2440_clk_add(struct device *dev, struct subsys_interface *sif)
167167
{
168168
struct clk *clock_upll;
169169
struct clk *clock_h;

‎drivers/pcmcia/pxa2xx_sharpsl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ static void sharpsl_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
194194
sharpsl_pcmcia_init_reset(skt);
195195
}
196196

197-
static struct pcmcia_low_level sharpsl_pcmcia_ops __initdata = {
197+
static struct pcmcia_low_level sharpsl_pcmcia_ops = {
198198
.owner = THIS_MODULE,
199199
.hw_init = sharpsl_pcmcia_hw_init,
200200
.socket_state = sharpsl_pcmcia_socket_state,

‎drivers/scsi/arm/fas216.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@ static void print_SCp(struct scsi_pointer *SCp, const char *prefix, const char *
179179
SCp->buffers_residual, suffix);
180180
}
181181

182+
#ifdef CHECK_STRUCTURE
182183
static void fas216_dumpinfo(FAS216_Info *info)
183184
{
184185
static int used = 0;
@@ -223,7 +224,6 @@ static void fas216_dumpinfo(FAS216_Info *info)
223224
info->internal_done, info->magic_end);
224225
}
225226

226-
#ifdef CHECK_STRUCTURE
227227
static void __fas216_checkmagic(FAS216_Info *info, const char *func)
228228
{
229229
int corruption = 0;

‎drivers/scsi/arm/oak.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
/*#define PSEUDO_DMA*/
2222

2323
#define OAKSCSI_PUBLIC_RELEASE 1
24+
#define DONT_USE_INTR
2425

2526
#define priv(host) ((struct NCR5380_hostdata *)(host)->hostdata)
2627
#define NCR5380_local_declare() void __iomem *_base

‎drivers/spi/spi-s3c64xx.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132

133133
struct s3c64xx_spi_dma_data {
134134
unsigned ch;
135-
enum dma_data_direction direction;
135+
enum dma_transfer_direction direction;
136136
enum dma_ch dmach;
137137
struct property *dma_prop;
138138
};
@@ -1067,11 +1067,11 @@ static int __devinit s3c64xx_spi_get_dmares(
10671067

10681068
if (tx) {
10691069
dma_data = &sdd->tx_dma;
1070-
dma_data->direction = DMA_TO_DEVICE;
1070+
dma_data->direction = DMA_MEM_TO_DEV;
10711071
chan_str = "tx";
10721072
} else {
10731073
dma_data = &sdd->rx_dma;
1074-
dma_data->direction = DMA_FROM_DEVICE;
1074+
dma_data->direction = DMA_DEV_TO_MEM;
10751075
chan_str = "rx";
10761076
}
10771077

‎drivers/usb/host/ehci-orion.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ static const struct hc_driver ehci_orion_hc_driver = {
160160
.clear_tt_buffer_complete = ehci_clear_tt_buffer_complete,
161161
};
162162

163-
static void __init
163+
static void __devinit
164164
ehci_orion_conf_mbus_windows(struct usb_hcd *hcd,
165165
const struct mbus_dram_target_info *dram)
166166
{

‎mm/slob.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@ static __always_inline void *
429429
__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
430430
{
431431
unsigned int *m;
432-
int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
432+
int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
433433
void *ret;
434434

435435
gfp &= gfp_allowed_mask;
@@ -502,7 +502,7 @@ void kfree(const void *block)
502502

503503
sp = virt_to_page(block);
504504
if (PageSlab(sp)) {
505-
int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
505+
int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
506506
unsigned int *m = (unsigned int *)(block - align);
507507
slob_free(m, *m + align);
508508
} else
@@ -521,7 +521,7 @@ size_t ksize(const void *block)
521521

522522
sp = virt_to_page(block);
523523
if (PageSlab(sp)) {
524-
int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
524+
int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
525525
unsigned int *m = (unsigned int *)(block - align);
526526
return SLOB_UNITS(*m) * SLOB_UNIT;
527527
} else

0 commit comments

Comments
 (0)