linux.git/drivers/net/can, branch v3.19-rc2

Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

2014-12-15T00:10:09+00:00

Pull driver core update from Greg KH:
 "Here's the set of driver core patches for 3.19-rc1.

  They are dominated by the removal of the .owner field in platform
  drivers.  They touch a lot of files, but they are "simple" changes,
  just removing a line in a structure.

  Other than that, a few minor driver core and debugfs changes.  There
  are some ath9k patches coming in through this tree that have been
  acked by the wireless maintainers as they relied on the debugfs
  changes.

  Everything has been in linux-next for a while"

* tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (324 commits)
  Revert "ath: ath9k: use debugfs_create_devm_seqfile() helper for seq_file entries"
  fs: debugfs: add forward declaration for struct device type
  firmware class: Deletion of an unnecessary check before the function call "vunmap"
  firmware loader: fix hung task warning dump
  devcoredump: provide a one-way disable function
  device: Add dev__once variants
  ath: ath9k: use debugfs_create_devm_seqfile() helper for seq_file entries
  ath: use seq_file api for ath9k debugfs files
  debugfs: add helper function to create device related seq_file
  drivers/base: cacheinfo: remove noisy error boot message
  Revert "core: platform: add warning if driver has no owner"
  drivers: base: support cpu cache information interface to userspace via sysfs
  drivers: base: add cpu_device_create to support per-cpu devices
  topology: replace custom attribute macros with standard DEVICE_ATTR*
  cpumask: factor out show_cpumap into separate helper function
  driver core: Fix unbalanced device reference in drivers_probe
  driver core: fix race with userland in device_add()
  sysfs/kernfs: make read requests on pre-alloc files use the buffer.
  sysfs/kernfs: allow attributes to request write buffer be pre-allocated.
  fs: sysfs: return EGBIG on write if offset is larger than file size
  ...

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2014-12-10T20:48:20+00:00

Conflicts:
	drivers/net/ethernet/amd/xgbe/xgbe-desc.c
	drivers/net/ethernet/renesas/sh_eth.c

Overlapping changes in both conflict cases.

Signed-off-by: David S. Miller

can: flexcan: Consolidate and unify state change handling

2014-12-07T20:22:10+00:00

Replacing error state change handling with the new mechanism.

Signed-off-by: Andri Yngvason 
Acked-by: Wolfgang Grandegger 
Signed-off-by: Marc Kleine-Budde

can: mscan: Consolidate and unify state change handling

2014-12-07T20:22:10+00:00

Replacing error state change handling with the new mechanism.

Signed-off-by: Andri Yngvason 
Acked-by: Wolfgang Grandegger 
Signed-off-by: Marc Kleine-Budde

can: sja1000: Consolidate and unify state change handling

2014-12-07T20:22:09+00:00

Replacing error state change handling with the new mechanism.

Signed-off-by: Andri Yngvason 
Acked-by: Wolfgang Grandegger 
Signed-off-by: Marc Kleine-Budde

can: dev: Consolidate and unify state change handling

2014-12-07T20:22:09+00:00

The handling of can error states is different between platforms.
This is an attempt to correct that problem.

I've moved this handling into a generic function for changing the
error state. This ensures that error state changes are handled
the same way everywhere (where this function is used).

This new mechanism also adds reverse state transitioning in error
frames, i.e. the user will be notified through the socket interface
when the state goes down.

Signed-off-by: Andri Yngvason 
Acked-by: Wolfgang Grandegger 
Signed-off-by: Marc Kleine-Budde

can: Enable -D__CHECK_ENDIAN__ for sparse by default

2014-12-07T20:22:06+00:00

This patch enables endian checking by default when running sparse via "make
C=2" for example.

Signed-off-by: Marc Kleine-Budde

can: fix spelling errors

2014-12-07T20:22:05+00:00

Fix various spelling errors in the comments of the CAN modules.

Signed-off-by: Jeremiah Mahler 
Acked-by: Oliver Hartkopp 
Signed-off-by: Marc Kleine-Budde

can: slcan/vcan: eliminate banner[] variable, switch to pr_info()

2014-12-07T20:22:05+00:00

Several can modules in drivers/net/can use a banner[] variable at the
top which defines a string that is used once during init.  This string
is also embedded with KERN_INFO which makes it printk() specific.

Improve the code by eliminating the banner[] variable and moving the
string to where it is printed.  Then switch from printk(KERN_INFO to
pr_info() for the lines that were changed.

This patch is similar to [1] which was applied to net/can.

  [1]: https://lkml.org/lkml/2014/11/22/10

Signed-off-by: Jeremiah Mahler 
Acked-by: Oliver Hartkopp 
Signed-off-by: Marc Kleine-Budde

can: peak_usb: fix multi-byte values endianess

2014-12-07T20:04:03+00:00

This patch fixes the endianess definition as well as the usage of the
multi-byte fields in the data structures exchanged with the PEAK-System USB
adapters.

By fixing the endianess, this patch also fixes the wrong usage of a 32-bits
local variable for handling the error status 16-bits field, in function
pcan_usb_pro_handle_error().

Signed-off-by: Stephane Grosjean 
Signed-off-by: Marc Kleine-Budde