@@ -328,6 +328,7 @@ static const struct irq_domain_ops grgpio_irq_domain_ops = {
328
328
static int grgpio_probe (struct platform_device * ofdev )
329
329
{
330
330
struct device_node * np = ofdev -> dev .of_node ;
331
+ struct device * dev = & ofdev -> dev ;
331
332
void __iomem * regs ;
332
333
struct gpio_chip * gc ;
333
334
struct grgpio_priv * priv ;
@@ -337,7 +338,7 @@ static int grgpio_probe(struct platform_device *ofdev)
337
338
int size ;
338
339
int i ;
339
340
340
- priv = devm_kzalloc (& ofdev -> dev , sizeof (* priv ), GFP_KERNEL );
341
+ priv = devm_kzalloc (dev , sizeof (* priv ), GFP_KERNEL );
341
342
if (!priv )
342
343
return - ENOMEM ;
343
344
@@ -346,28 +347,28 @@ static int grgpio_probe(struct platform_device *ofdev)
346
347
return PTR_ERR (regs );
347
348
348
349
gc = & priv -> gc ;
349
- err = bgpio_init (gc , & ofdev -> dev , 4 , regs + GRGPIO_DATA ,
350
+ err = bgpio_init (gc , dev , 4 , regs + GRGPIO_DATA ,
350
351
regs + GRGPIO_OUTPUT , NULL , regs + GRGPIO_DIR , NULL ,
351
352
BGPIOF_BIG_ENDIAN_BYTE_ORDER );
352
353
if (err ) {
353
- dev_err (& ofdev -> dev , "bgpio_init() failed\n" );
354
+ dev_err (dev , "bgpio_init() failed\n" );
354
355
return err ;
355
356
}
356
357
357
358
priv -> regs = regs ;
358
359
priv -> imask = gc -> read_reg (regs + GRGPIO_IMASK );
359
- priv -> dev = & ofdev -> dev ;
360
+ priv -> dev = dev ;
360
361
361
362
gc -> owner = THIS_MODULE ;
362
363
gc -> to_irq = grgpio_to_irq ;
363
- gc -> label = devm_kasprintf (& ofdev -> dev , GFP_KERNEL , "%pOF" , np );
364
+ gc -> label = devm_kasprintf (dev , GFP_KERNEL , "%pOF" , np );
364
365
gc -> base = -1 ;
365
366
366
367
err = of_property_read_u32 (np , "nbits" , & prop );
367
368
if (err || prop <= 0 || prop > GRGPIO_MAX_NGPIO ) {
368
369
gc -> ngpio = GRGPIO_MAX_NGPIO ;
369
- dev_dbg (& ofdev -> dev ,
370
- "No or invalid nbits property: assume %d\n" , gc -> ngpio );
370
+ dev_dbg (dev , "No or invalid nbits property: assume %d\n" ,
371
+ gc -> ngpio );
371
372
} else {
372
373
gc -> ngpio = prop ;
373
374
}
@@ -379,7 +380,7 @@ static int grgpio_probe(struct platform_device *ofdev)
379
380
irqmap = (s32 * )of_get_property (np , "irqmap" , & size );
380
381
if (irqmap ) {
381
382
if (size < gc -> ngpio ) {
382
- dev_err (& ofdev -> dev ,
383
+ dev_err (dev ,
383
384
"irqmap shorter than ngpio (%d < %d)\n" ,
384
385
size , gc -> ngpio );
385
386
return - EINVAL ;
@@ -389,7 +390,7 @@ static int grgpio_probe(struct platform_device *ofdev)
389
390
& grgpio_irq_domain_ops ,
390
391
priv );
391
392
if (!priv -> domain ) {
392
- dev_err (& ofdev -> dev , "Could not add irq domain\n" );
393
+ dev_err (dev , "Could not add irq domain\n" );
393
394
return - EINVAL ;
394
395
}
395
396
@@ -419,13 +420,13 @@ static int grgpio_probe(struct platform_device *ofdev)
419
420
420
421
err = gpiochip_add_data (gc , priv );
421
422
if (err ) {
422
- dev_err (& ofdev -> dev , "Could not add gpiochip\n" );
423
+ dev_err (dev , "Could not add gpiochip\n" );
423
424
if (priv -> domain )
424
425
irq_domain_remove (priv -> domain );
425
426
return err ;
426
427
}
427
428
428
- dev_info (& ofdev -> dev , "regs=0x%p, base=%d, ngpio=%d, irqs=%s\n" ,
429
+ dev_info (dev , "regs=0x%p, base=%d, ngpio=%d, irqs=%s\n" ,
429
430
priv -> regs , gc -> base , gc -> ngpio , priv -> domain ? "on" : "off" );
430
431
431
432
return 0 ;
0 commit comments